@aztec/p2p 0.0.1-commit.fce3e4f → 0.0.1-commit.fffb133c

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 (282) hide show
  1. package/dest/client/factory.d.ts +2 -2
  2. package/dest/client/factory.d.ts.map +1 -1
  3. package/dest/client/factory.js +2 -3
  4. package/dest/client/interface.d.ts +18 -5
  5. package/dest/client/interface.d.ts.map +1 -1
  6. package/dest/client/p2p_client.d.ts +16 -19
  7. package/dest/client/p2p_client.d.ts.map +1 -1
  8. package/dest/client/p2p_client.js +460 -127
  9. package/dest/config.d.ts +4 -7
  10. package/dest/config.d.ts.map +1 -1
  11. package/dest/config.js +10 -13
  12. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +61 -42
  13. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  14. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  15. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  16. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +239 -265
  17. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +21 -18
  18. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
  19. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +114 -109
  20. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +17 -16
  21. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
  22. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +89 -128
  23. package/dest/mem_pools/attestation_pool/mocks.d.ts +11 -8
  24. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  25. package/dest/mem_pools/attestation_pool/mocks.js +17 -13
  26. package/dest/mem_pools/instrumentation.d.ts +7 -1
  27. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  28. package/dest/mem_pools/instrumentation.js +30 -12
  29. package/dest/mem_pools/interface.d.ts +3 -4
  30. package/dest/mem_pools/interface.d.ts.map +1 -1
  31. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +37 -27
  32. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
  33. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +314 -335
  34. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +32 -0
  35. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +1 -0
  36. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +112 -0
  37. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +157 -0
  38. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +1 -0
  39. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +52 -0
  40. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +16 -0
  41. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -0
  42. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +122 -0
  43. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +17 -0
  44. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +1 -0
  45. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +84 -0
  46. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +19 -0
  47. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +1 -0
  48. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +78 -0
  49. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +26 -0
  50. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +1 -0
  51. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +84 -0
  52. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +25 -0
  53. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +1 -0
  54. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +57 -0
  55. package/dest/mem_pools/tx_pool/index.d.ts +1 -2
  56. package/dest/mem_pools/tx_pool/index.d.ts.map +1 -1
  57. package/dest/mem_pools/tx_pool/index.js +0 -1
  58. package/dest/mem_pools/tx_pool/priority.d.ts +5 -1
  59. package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -1
  60. package/dest/mem_pools/tx_pool/priority.js +6 -1
  61. package/dest/mem_pools/tx_pool/tx_pool.d.ts +11 -6
  62. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
  63. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +1 -1
  64. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -1
  65. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +30 -24
  66. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +4 -4
  67. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  68. package/dest/msg_validators/attestation_validator/attestation_validator.js +52 -19
  69. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +5 -5
  70. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  71. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +18 -14
  72. package/dest/msg_validators/clock_tolerance.d.ts +21 -0
  73. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -0
  74. package/dest/msg_validators/clock_tolerance.js +37 -0
  75. package/dest/msg_validators/index.d.ts +2 -2
  76. package/dest/msg_validators/index.d.ts.map +1 -1
  77. package/dest/msg_validators/index.js +1 -1
  78. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +9 -0
  79. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -0
  80. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +6 -0
  81. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +9 -0
  82. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -0
  83. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +6 -0
  84. package/dest/msg_validators/proposal_validator/index.d.ts +4 -0
  85. package/dest/msg_validators/proposal_validator/index.d.ts.map +1 -0
  86. package/dest/msg_validators/proposal_validator/index.js +3 -0
  87. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +13 -0
  88. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -0
  89. package/dest/msg_validators/proposal_validator/proposal_validator.js +104 -0
  90. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +23 -0
  91. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +1 -0
  92. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +212 -0
  93. package/dest/msg_validators/tx_validator/archive_cache.d.ts +2 -2
  94. package/dest/msg_validators/tx_validator/archive_cache.d.ts.map +1 -1
  95. package/dest/msg_validators/tx_validator/block_header_validator.d.ts +2 -2
  96. package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
  97. package/dest/msg_validators/tx_validator/block_header_validator.js +1 -1
  98. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  99. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  100. package/dest/msg_validators/tx_validator/factory.d.ts +4 -3
  101. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  102. package/dest/msg_validators/tx_validator/factory.js +1 -1
  103. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +10 -0
  104. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -0
  105. package/dest/msg_validators/tx_validator/fee_payer_balance.js +20 -0
  106. package/dest/msg_validators/tx_validator/gas_validator.d.ts +1 -1
  107. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  108. package/dest/msg_validators/tx_validator/gas_validator.js +8 -14
  109. package/dest/msg_validators/tx_validator/index.d.ts +2 -1
  110. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  111. package/dest/msg_validators/tx_validator/index.js +1 -0
  112. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +2 -2
  113. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  114. package/dest/msg_validators/tx_validator/size_validator.d.ts +6 -0
  115. package/dest/msg_validators/tx_validator/size_validator.d.ts.map +1 -0
  116. package/dest/msg_validators/tx_validator/size_validator.js +20 -0
  117. package/dest/msg_validators/tx_validator/test_utils.d.ts +2 -2
  118. package/dest/msg_validators/tx_validator/test_utils.d.ts.map +1 -1
  119. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +3 -2
  120. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
  121. package/dest/services/dummy_service.d.ts +6 -2
  122. package/dest/services/dummy_service.d.ts.map +1 -1
  123. package/dest/services/dummy_service.js +3 -0
  124. package/dest/services/encoding.d.ts +1 -1
  125. package/dest/services/encoding.d.ts.map +1 -1
  126. package/dest/services/encoding.js +7 -6
  127. package/dest/services/libp2p/instrumentation.d.ts +1 -1
  128. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  129. package/dest/services/libp2p/instrumentation.js +20 -73
  130. package/dest/services/libp2p/libp2p_service.d.ts +31 -14
  131. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  132. package/dest/services/libp2p/libp2p_service.js +722 -168
  133. package/dest/services/peer-manager/metrics.d.ts +6 -1
  134. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  135. package/dest/services/peer-manager/metrics.js +18 -21
  136. package/dest/services/peer-manager/peer_manager.d.ts +2 -2
  137. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  138. package/dest/services/peer-manager/peer_manager.js +4 -12
  139. package/dest/services/peer-manager/peer_scoring.d.ts +1 -1
  140. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  141. package/dest/services/peer-manager/peer_scoring.js +2 -5
  142. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +1 -1
  143. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -1
  144. package/dest/services/reqresp/constants.d.ts +12 -0
  145. package/dest/services/reqresp/constants.d.ts.map +1 -0
  146. package/dest/services/reqresp/constants.js +7 -0
  147. package/dest/services/reqresp/interface.d.ts +2 -2
  148. package/dest/services/reqresp/interface.d.ts.map +1 -1
  149. package/dest/services/reqresp/interface.js +1 -1
  150. package/dest/services/reqresp/metrics.d.ts +1 -1
  151. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  152. package/dest/services/reqresp/metrics.js +5 -21
  153. package/dest/services/reqresp/protocols/auth.d.ts +2 -2
  154. package/dest/services/reqresp/protocols/auth.d.ts.map +1 -1
  155. package/dest/services/reqresp/protocols/auth.js +2 -2
  156. package/dest/services/reqresp/protocols/block.d.ts +1 -1
  157. package/dest/services/reqresp/protocols/block.d.ts.map +1 -1
  158. package/dest/services/reqresp/protocols/block.js +3 -2
  159. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts +1 -1
  160. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts.map +1 -1
  161. package/dest/services/reqresp/protocols/block_txs/bitvector.js +7 -0
  162. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +2 -2
  163. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
  164. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +1 -1
  165. package/dest/services/reqresp/protocols/status.d.ts +5 -4
  166. package/dest/services/reqresp/protocols/status.d.ts.map +1 -1
  167. package/dest/services/reqresp/protocols/status.js +7 -3
  168. package/dest/services/reqresp/protocols/tx.d.ts +2 -3
  169. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
  170. package/dest/services/reqresp/reqresp.js +402 -24
  171. package/dest/services/service.d.ts +16 -3
  172. package/dest/services/service.d.ts.map +1 -1
  173. package/dest/services/tx_collection/config.js +1 -1
  174. package/dest/services/tx_collection/fast_tx_collection.d.ts +4 -3
  175. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
  176. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  177. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  178. package/dest/services/tx_collection/instrumentation.js +4 -14
  179. package/dest/services/tx_collection/slow_tx_collection.d.ts +4 -3
  180. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
  181. package/dest/services/tx_collection/tx_collection.d.ts +7 -6
  182. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  183. package/dest/services/tx_provider.d.ts +4 -2
  184. package/dest/services/tx_provider.d.ts.map +1 -1
  185. package/dest/services/tx_provider.js +11 -2
  186. package/dest/services/tx_provider_instrumentation.d.ts +5 -2
  187. package/dest/services/tx_provider_instrumentation.d.ts.map +1 -1
  188. package/dest/services/tx_provider_instrumentation.js +13 -13
  189. package/dest/test-helpers/mock-tx-helpers.js +1 -1
  190. package/dest/test-helpers/reqresp-nodes.d.ts +2 -2
  191. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  192. package/dest/testbench/p2p_client_testbench_worker.js +31 -17
  193. package/dest/testbench/worker_client_manager.d.ts +1 -1
  194. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  195. package/dest/testbench/worker_client_manager.js +6 -1
  196. package/package.json +18 -18
  197. package/src/client/factory.ts +5 -10
  198. package/src/client/interface.ts +19 -4
  199. package/src/client/p2p_client.ts +101 -154
  200. package/src/config.ts +12 -18
  201. package/src/mem_pools/attestation_pool/attestation_pool.ts +68 -41
  202. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +241 -289
  203. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +163 -141
  204. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +141 -164
  205. package/src/mem_pools/attestation_pool/mocks.ts +21 -15
  206. package/src/mem_pools/instrumentation.ts +38 -14
  207. package/src/mem_pools/interface.ts +2 -4
  208. package/src/mem_pools/tx_pool/README.md +270 -0
  209. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +367 -371
  210. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +132 -0
  211. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +208 -0
  212. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +162 -0
  213. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +104 -0
  214. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +93 -0
  215. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +106 -0
  216. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +75 -0
  217. package/src/mem_pools/tx_pool/index.ts +0 -1
  218. package/src/mem_pools/tx_pool/priority.ts +8 -1
  219. package/src/mem_pools/tx_pool/tx_pool.ts +11 -5
  220. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +23 -17
  221. package/src/msg_validators/attestation_validator/attestation_validator.ts +37 -22
  222. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +13 -16
  223. package/src/msg_validators/clock_tolerance.ts +51 -0
  224. package/src/msg_validators/index.ts +1 -1
  225. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +10 -0
  226. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +13 -0
  227. package/src/msg_validators/proposal_validator/index.ts +3 -0
  228. package/src/msg_validators/proposal_validator/proposal_validator.ts +92 -0
  229. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +230 -0
  230. package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
  231. package/src/msg_validators/tx_validator/block_header_validator.ts +4 -2
  232. package/src/msg_validators/tx_validator/data_validator.ts +12 -4
  233. package/src/msg_validators/tx_validator/factory.ts +3 -2
  234. package/src/msg_validators/tx_validator/fee_payer_balance.ts +40 -0
  235. package/src/msg_validators/tx_validator/gas_validator.ts +8 -25
  236. package/src/msg_validators/tx_validator/index.ts +1 -0
  237. package/src/msg_validators/tx_validator/metadata_validator.ts +13 -5
  238. package/src/msg_validators/tx_validator/size_validator.ts +18 -0
  239. package/src/msg_validators/tx_validator/test_utils.ts +1 -1
  240. package/src/msg_validators/tx_validator/timestamp_validator.ts +5 -2
  241. package/src/services/dummy_service.ts +6 -0
  242. package/src/services/encoding.ts +6 -5
  243. package/src/services/libp2p/instrumentation.ts +19 -73
  244. package/src/services/libp2p/libp2p_service.ts +369 -138
  245. package/src/services/peer-manager/metrics.ts +22 -21
  246. package/src/services/peer-manager/peer_manager.ts +5 -4
  247. package/src/services/peer-manager/peer_scoring.ts +1 -5
  248. package/src/services/reqresp/connection-sampler/connection_sampler.ts +3 -1
  249. package/src/services/reqresp/constants.ts +14 -0
  250. package/src/services/reqresp/interface.ts +1 -1
  251. package/src/services/reqresp/metrics.ts +7 -23
  252. package/src/services/reqresp/protocols/auth.ts +2 -2
  253. package/src/services/reqresp/protocols/block.ts +3 -2
  254. package/src/services/reqresp/protocols/block_txs/bitvector.ts +9 -0
  255. package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +1 -1
  256. package/src/services/reqresp/protocols/status.ts +16 -12
  257. package/src/services/reqresp/protocols/tx.ts +1 -2
  258. package/src/services/service.ts +19 -4
  259. package/src/services/tx_collection/config.ts +1 -1
  260. package/src/services/tx_collection/fast_tx_collection.ts +3 -2
  261. package/src/services/tx_collection/instrumentation.ts +4 -21
  262. package/src/services/tx_collection/slow_tx_collection.ts +3 -3
  263. package/src/services/tx_collection/tx_collection.ts +6 -5
  264. package/src/services/tx_provider.ts +19 -3
  265. package/src/services/tx_provider_instrumentation.ts +18 -14
  266. package/src/test-helpers/mock-pubsub.ts +1 -1
  267. package/src/test-helpers/mock-tx-helpers.ts +1 -1
  268. package/src/test-helpers/reqresp-nodes.ts +1 -1
  269. package/src/testbench/p2p_client_testbench_worker.ts +42 -22
  270. package/src/testbench/worker_client_manager.ts +6 -1
  271. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +0 -80
  272. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +0 -1
  273. package/dest/mem_pools/tx_pool/memory_tx_pool.js +0 -238
  274. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +0 -12
  275. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +0 -1
  276. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +0 -82
  277. package/dest/msg_validators/block_proposal_validator/index.d.ts +0 -2
  278. package/dest/msg_validators/block_proposal_validator/index.d.ts.map +0 -1
  279. package/dest/msg_validators/block_proposal_validator/index.js +0 -1
  280. package/src/mem_pools/tx_pool/memory_tx_pool.ts +0 -283
  281. package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +0 -97
  282. package/src/msg_validators/block_proposal_validator/index.ts +0 -1
@@ -1,53 +1,86 @@
1
- import { NoCommitteeError } from '@aztec/ethereum';
1
+ import { NoCommitteeError } from '@aztec/ethereum/contracts';
2
2
  import { createLogger } from '@aztec/foundation/log';
3
3
  import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
4
- export class AttestationValidator {
4
+ import { isWithinClockTolerance } from '../clock_tolerance.js';
5
+ export class CheckpointAttestationValidator {
5
6
  epochCache;
6
7
  logger;
7
8
  constructor(epochCache){
8
9
  this.epochCache = epochCache;
9
- this.logger = createLogger('p2p:attestation-validator');
10
+ this.logger = createLogger('p2p:checkpoint-attestation-validator');
10
11
  }
11
12
  async validate(message) {
12
13
  const slotNumber = message.payload.header.slotNumber;
13
14
  try {
14
- const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
15
+ const { currentSlot, nextSlot } = this.epochCache.getCurrentAndNextSlot();
15
16
  if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
16
- this.logger.warn(`Attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
17
- return PeerErrorSeverity.HighToleranceError;
17
+ // Check if message is for previous slot and within clock tolerance
18
+ if (!isWithinClockTolerance(slotNumber, currentSlot, this.epochCache)) {
19
+ this.logger.warn(`Checkpoint attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
20
+ return {
21
+ result: 'reject',
22
+ severity: PeerErrorSeverity.HighToleranceError
23
+ };
24
+ }
25
+ this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
26
+ return {
27
+ result: 'ignore'
28
+ };
18
29
  }
19
30
  // Verify the signature is valid
20
31
  const attester = message.getSender();
21
32
  if (attester === undefined) {
22
- this.logger.warn(`Invalid signature in attestation for slot ${slotNumber}`);
23
- return PeerErrorSeverity.LowToleranceError;
33
+ this.logger.warn(`Invalid signature in checkpoint attestation for slot ${slotNumber}`);
34
+ return {
35
+ result: 'reject',
36
+ severity: PeerErrorSeverity.LowToleranceError
37
+ };
24
38
  }
25
39
  // Verify the attester is in the committee for this slot
26
40
  if (!await this.epochCache.isInCommittee(slotNumber, attester)) {
27
41
  this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumber}`);
28
- return PeerErrorSeverity.HighToleranceError;
42
+ return {
43
+ result: 'reject',
44
+ severity: PeerErrorSeverity.HighToleranceError
45
+ };
29
46
  }
30
- // Verify the proposer signature matches the expected proposer for this slot
47
+ // Verify the proposer signature matches the expected proposer for the attestation's slot
48
+ // We look up the proposer for the specific slot rather than using currentSlot/nextSlot
49
+ // since timing differences could cause mismatches
31
50
  const proposer = message.getProposer();
32
- const expectedProposer = slotNumber === currentSlot ? currentProposer : nextProposer;
51
+ const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
33
52
  if (!expectedProposer) {
34
53
  this.logger.warn(`No proposer defined for slot ${slotNumber}`);
35
- return PeerErrorSeverity.HighToleranceError;
54
+ return {
55
+ result: 'reject',
56
+ severity: PeerErrorSeverity.HighToleranceError
57
+ };
36
58
  }
37
59
  if (!proposer) {
38
- this.logger.warn(`Invalid proposer signature in attestation for slot ${slotNumber}`);
39
- return PeerErrorSeverity.LowToleranceError;
60
+ this.logger.warn(`Invalid proposer signature in checkpoint attestation for slot ${slotNumber}`);
61
+ return {
62
+ result: 'reject',
63
+ severity: PeerErrorSeverity.LowToleranceError
64
+ };
40
65
  }
41
66
  if (!proposer.equals(expectedProposer)) {
42
- this.logger.warn(`Proposer signature mismatch in attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
43
- return PeerErrorSeverity.HighToleranceError;
67
+ this.logger.warn(`Proposer signature mismatch in checkpoint attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
68
+ return {
69
+ result: 'reject',
70
+ severity: PeerErrorSeverity.HighToleranceError
71
+ };
44
72
  }
45
- return undefined;
73
+ return {
74
+ result: 'accept'
75
+ };
46
76
  } catch (e) {
47
77
  // People shouldn't be sending us attestations if the committee doesn't exist
48
78
  if (e instanceof NoCommitteeError) {
49
- this.logger.warn(`No committee exists for attestation for slot ${slotNumber}`);
50
- return PeerErrorSeverity.LowToleranceError;
79
+ this.logger.warn(`No committee exists for checkpoint attestation for slot ${slotNumber}`);
80
+ return {
81
+ result: 'reject',
82
+ severity: PeerErrorSeverity.LowToleranceError
83
+ };
51
84
  }
52
85
  throw e;
53
86
  }
@@ -1,8 +1,8 @@
1
1
  import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
- import { type BlockAttestation, PeerErrorSeverity } from '@aztec/stdlib/p2p';
2
+ import { type CheckpointAttestation, type ValidationResult } from '@aztec/stdlib/p2p';
3
3
  import { type TelemetryClient } from '@aztec/telemetry-client';
4
4
  import type { AttestationPool } from '../../mem_pools/attestation_pool/attestation_pool.js';
5
- import { AttestationValidator } from './attestation_validator.js';
5
+ import { CheckpointAttestationValidator } from './attestation_validator.js';
6
6
  /**
7
7
  * FishermanAttestationValidator extends the base AttestationValidator to add
8
8
  * additional validation for fisherman nodes: verifying that attestations sign
@@ -11,10 +11,10 @@ import { AttestationValidator } from './attestation_validator.js';
11
11
  * handled by LibP2PService based on the fishermanMode config to ensure a better
12
12
  * view of the network.
13
13
  */
14
- export declare class FishermanAttestationValidator extends AttestationValidator {
14
+ export declare class FishermanAttestationValidator extends CheckpointAttestationValidator {
15
15
  private attestationPool;
16
16
  private invalidAttestationCounter;
17
17
  constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPool, telemetryClient: TelemetryClient);
18
- validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
18
+ validate(message: CheckpointAttestation): Promise<ValidationResult>;
19
19
  }
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3RSxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFhLE1BQU0seUJBQXlCLENBQUM7QUFFL0YsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFbEU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLG9CQUFvQjtJQUtuRSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBVWpDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLENBd0R6RjtDQUNGIn0=
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXFCLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RyxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQUs3RSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBT2pDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0F3RGpGO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAuB,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAE/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,oBAAoB;IAKnE,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,eAAe,EACxC,eAAe,EAAE,eAAe,EAUjC;IAEc,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwDzF;CACF"}
1
+ {"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,qBAAqB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzG,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,8BAA8B;IAK7E,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,eAAe,EACxC,eAAe,EAAE,eAAe,EAOjC;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwDjF;CACF"}
@@ -1,6 +1,6 @@
1
1
  import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
2
- import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
3
- import { AttestationValidator } from './attestation_validator.js';
2
+ import { Attributes, Metrics } from '@aztec/telemetry-client';
3
+ import { CheckpointAttestationValidator } from './attestation_validator.js';
4
4
  /**
5
5
  * FishermanAttestationValidator extends the base AttestationValidator to add
6
6
  * additional validation for fisherman nodes: verifying that attestations sign
@@ -8,22 +8,19 @@ import { AttestationValidator } from './attestation_validator.js';
8
8
  * Invalid attestations are rejected (not propagated), but peer penalization is
9
9
  * handled by LibP2PService based on the fishermanMode config to ensure a better
10
10
  * view of the network.
11
- */ export class FishermanAttestationValidator extends AttestationValidator {
11
+ */ export class FishermanAttestationValidator extends CheckpointAttestationValidator {
12
12
  attestationPool;
13
13
  invalidAttestationCounter;
14
14
  constructor(epochCache, attestationPool, telemetryClient){
15
15
  super(epochCache), this.attestationPool = attestationPool;
16
16
  this.logger = this.logger.createChild('[FISHERMAN]');
17
17
  const meter = telemetryClient.getMeter('FishermanAttestationValidator');
18
- this.invalidAttestationCounter = meter.createUpDownCounter(Metrics.VALIDATOR_INVALID_ATTESTATION_RECEIVED_COUNT, {
19
- description: 'The number of invalid attestations received',
20
- valueType: ValueType.INT
21
- });
18
+ this.invalidAttestationCounter = meter.createUpDownCounter(Metrics.VALIDATOR_INVALID_ATTESTATION_RECEIVED_COUNT);
22
19
  }
23
20
  async validate(message) {
24
21
  // First run the standard validation
25
22
  const baseValidationResult = await super.validate(message);
26
- if (baseValidationResult !== undefined) {
23
+ if (baseValidationResult.result !== 'accept') {
27
24
  // Track base validation failures (invalid signature, wrong committee, etc.)
28
25
  this.invalidAttestationCounter.add(1, {
29
26
  [Attributes.ERROR_TYPE]: 'base_validation_failed'
@@ -35,20 +32,22 @@ import { AttestationValidator } from './attestation_validator.js';
35
32
  const attester = message.getSender();
36
33
  const proposer = message.getProposer();
37
34
  if (!attester || !proposer) {
38
- return undefined;
35
+ return {
36
+ result: 'accept'
37
+ };
39
38
  }
40
39
  const proposalId = message.archive.toString();
41
- const proposal = await this.attestationPool.getBlockProposal(proposalId);
40
+ const proposal = await this.attestationPool.getCheckpointProposal(proposalId);
42
41
  if (proposal) {
43
42
  // Compare the attestation payload with the proposal payload
44
- if (!message.payload.equals(proposal.payload)) {
43
+ if (!message.payload.equals(proposal)) {
45
44
  this.logger.error(`Attestation payload mismatch for slot ${slotNumberBigInt}! ` + `Attester ${attester.toString()} signed different data than the proposal.`, {
46
45
  slot: slotNumberBigInt.toString(),
47
46
  attester: attester.toString(),
48
47
  proposer: proposer.toString(),
49
48
  proposalArchive: proposal.archive.toString(),
50
49
  attestationArchive: message.archive.toString(),
51
- proposalHeader: proposal.payload.header.hash().toString(),
50
+ proposalHeader: proposal.checkpointHeader.hash().toString(),
52
51
  attestationHeader: message.payload.header.hash().toString()
53
52
  });
54
53
  // Track invalid attestation metric
@@ -56,12 +55,17 @@ import { AttestationValidator } from './attestation_validator.js';
56
55
  [Attributes.ERROR_TYPE]: 'payload_mismatch'
57
56
  });
58
57
  // Return error to reject the message, but LibP2PService won't penalize in fisherman mode
59
- return PeerErrorSeverity.LowToleranceError;
58
+ return {
59
+ result: 'reject',
60
+ severity: PeerErrorSeverity.LowToleranceError
61
+ };
60
62
  }
61
63
  } else {
62
64
  // We might receive attestations before proposals in some cases
63
65
  this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet. ` + `Proposal ID: ${proposalId}`);
64
66
  }
65
- return undefined;
67
+ return {
68
+ result: 'accept'
69
+ };
66
70
  }
67
71
  }
@@ -0,0 +1,21 @@
1
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
+ import { SlotNumber } from '@aztec/foundation/branded-types';
3
+ /**
4
+ * Maximum clock disparity tolerance for P2P message validation (in milliseconds).
5
+ * Messages for the previous slot are accepted if we're within this many milliseconds
6
+ * of the current slot start. This prevents penalizing peers for messages that
7
+ * were valid when sent but arrived slightly late due to network latency.
8
+ *
9
+ * This follows Ethereum's MAXIMUM_GOSSIP_CLOCK_DISPARITY approach.
10
+ */
11
+ export declare const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
12
+ /**
13
+ * Checks if a message for the previous slot should be accepted due to clock tolerance.
14
+ *
15
+ * @param messageSlot - The slot number from the received message
16
+ * @param currentSlot - The current slot number
17
+ * @param epochCache - EpochCache to get timing information
18
+ * @returns true if the message is for the previous slot AND we're within the clock tolerance window
19
+ */
20
+ export declare function isWithinClockTolerance(messageSlot: SlotNumber, currentSlot: SlotNumber, epochCache: EpochCacheInterface): boolean;
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvY2tfdG9sZXJhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvY2xvY2tfdG9sZXJhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTdEOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0saUNBQWlDLE1BQU0sQ0FBQztBQUVyRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxXQUFXLEVBQUUsVUFBVSxFQUN2QixXQUFXLEVBQUUsVUFBVSxFQUN2QixVQUFVLEVBQUUsbUJBQW1CLEdBQzlCLE9BQU8sQ0F5QlQifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clock_tolerance.d.ts","sourceRoot":"","sources":["../../src/msg_validators/clock_tolerance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D;;;;;;;GAOG;AACH,eAAO,MAAM,iCAAiC,MAAM,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CAyBT"}
@@ -0,0 +1,37 @@
1
+ import { SlotNumber } from '@aztec/foundation/branded-types';
2
+ /**
3
+ * Maximum clock disparity tolerance for P2P message validation (in milliseconds).
4
+ * Messages for the previous slot are accepted if we're within this many milliseconds
5
+ * of the current slot start. This prevents penalizing peers for messages that
6
+ * were valid when sent but arrived slightly late due to network latency.
7
+ *
8
+ * This follows Ethereum's MAXIMUM_GOSSIP_CLOCK_DISPARITY approach.
9
+ */ export const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
10
+ /**
11
+ * Checks if a message for the previous slot should be accepted due to clock tolerance.
12
+ *
13
+ * @param messageSlot - The slot number from the received message
14
+ * @param currentSlot - The current slot number
15
+ * @param epochCache - EpochCache to get timing information
16
+ * @returns true if the message is for the previous slot AND we're within the clock tolerance window
17
+ */ export function isWithinClockTolerance(messageSlot, currentSlot, epochCache) {
18
+ // Guard against slot 0 edge case (genesis)
19
+ if (currentSlot === SlotNumber.ZERO) {
20
+ return false;
21
+ }
22
+ // Only apply tolerance to messages for the previous slot
23
+ const previousSlot = SlotNumber(currentSlot - 1);
24
+ if (messageSlot !== previousSlot) {
25
+ return false;
26
+ }
27
+ // Check how far we are into the current slot (in milliseconds)
28
+ const { ts: slotStartTs, nowMs, slot } = epochCache.getEpochAndSlotNow();
29
+ // Sanity check: ensure the epoch cache's current slot matches the expected current slot
30
+ if (slot !== currentSlot) {
31
+ return false;
32
+ }
33
+ // ts is in seconds, convert to ms; nowMs is already in milliseconds
34
+ const slotStartMs = slotStartTs * 1000n;
35
+ const elapsedMs = Number(nowMs - slotStartMs);
36
+ return elapsedMs < MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS;
37
+ }
@@ -1,4 +1,4 @@
1
1
  export * from './tx_validator/index.js';
2
- export * from './block_proposal_validator/index.js';
2
+ export * from './proposal_validator/index.js';
3
3
  export * from './attestation_validator/index.js';
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMscUNBQXFDLENBQUM7QUFDcEQsY0FBYyxrQ0FBa0MsQ0FBQyJ9
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxrQ0FBa0MsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/msg_validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,qCAAqC,CAAC;AACpD,cAAc,kCAAkC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/msg_validators/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC"}
@@ -1,3 +1,3 @@
1
1
  export * from './tx_validator/index.js';
2
- export * from './block_proposal_validator/index.js';
2
+ export * from './proposal_validator/index.js';
3
3
  export * from './attestation_validator/index.js';
@@ -0,0 +1,9 @@
1
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
+ import type { BlockProposal, P2PValidator } from '@aztec/stdlib/p2p';
3
+ import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
4
+ export declare class BlockProposalValidator extends ProposalValidator<BlockProposal> implements P2PValidator<BlockProposal> {
5
+ constructor(epochCache: EpochCacheInterface, opts: {
6
+ txsPermitted: boolean;
7
+ });
8
+ }
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSxzQkFBdUIsU0FBUSxpQkFBaUIsQ0FBQyxhQUFhLENBQUUsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ2pILFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUUzRTtDQUNGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,aAAa,CAAE,YAAW,YAAY,CAAC,aAAa,CAAC;IACjH,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAE3E;CACF"}
@@ -0,0 +1,6 @@
1
+ import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
2
+ export class BlockProposalValidator extends ProposalValidator {
3
+ constructor(epochCache, opts){
4
+ super(epochCache, opts, 'p2p:block_proposal_validator');
5
+ }
6
+ }
@@ -0,0 +1,9 @@
1
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
+ import type { CheckpointProposal, P2PValidator } from '@aztec/stdlib/p2p';
3
+ import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
4
+ export declare class CheckpointProposalValidator extends ProposalValidator<CheckpointProposal> implements P2PValidator<CheckpointProposal> {
5
+ constructor(epochCache: EpochCacheInterface, opts: {
6
+ txsPermitted: boolean;
7
+ });
8
+ }
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSwyQkFDWCxTQUFRLGlCQUFpQixDQUFDLGtCQUFrQixDQUM1QyxZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUUzQyxZQUFZLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxZQUFZLEVBQUUsT0FBTyxDQUFBO0tBQUUsRUFFM0U7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"checkpoint_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,2BACX,SAAQ,iBAAiB,CAAC,kBAAkB,CAC5C,YAAW,YAAY,CAAC,kBAAkB,CAAC;IAE3C,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAE3E;CACF"}
@@ -0,0 +1,6 @@
1
+ import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
2
+ export class CheckpointProposalValidator extends ProposalValidator {
3
+ constructor(epochCache, opts){
4
+ super(epochCache, opts, 'p2p:checkpoint_proposal_validator');
5
+ }
6
+ }
@@ -0,0 +1,4 @@
1
+ export * from './block_proposal_validator.js';
2
+ export * from './checkpoint_proposal_validator.js';
3
+ export * from './proposal_validator.js';
4
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLG9DQUFvQyxDQUFDO0FBQ25ELGNBQWMseUJBQXlCLENBQUMifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC"}
@@ -0,0 +1,3 @@
1
+ export * from './block_proposal_validator.js';
2
+ export * from './checkpoint_proposal_validator.js';
3
+ export * from './proposal_validator.js';
@@ -0,0 +1,13 @@
1
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
+ import { type Logger } from '@aztec/foundation/log';
3
+ import { BlockProposal, CheckpointProposal, type ValidationResult } from '@aztec/stdlib/p2p';
4
+ export declare abstract class ProposalValidator<TProposal extends BlockProposal | CheckpointProposal> {
5
+ protected epochCache: EpochCacheInterface;
6
+ protected logger: Logger;
7
+ protected txsPermitted: boolean;
8
+ constructor(epochCache: EpochCacheInterface, opts: {
9
+ txsPermitted: boolean;
10
+ }, loggerName: string);
11
+ validate(proposal: TProposal): Promise<ValidationResult>;
12
+ }
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFxQixLQUFLLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEgsOEJBQXNCLGlCQUFpQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQzFGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsU0FBUyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUM7SUFFaEMsWUFBWSxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFJL0Y7SUFFWSxRQUFRLENBQUMsUUFBUSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0F3RXBFO0NBQ0YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIhH,8BAAsB,iBAAiB,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC1F,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAEhC,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAAE,UAAU,EAAE,MAAM,EAI/F;IAEY,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwEpE;CACF"}
@@ -0,0 +1,104 @@
1
+ import { NoCommitteeError } from '@aztec/ethereum/contracts';
2
+ import { createLogger } from '@aztec/foundation/log';
3
+ import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
4
+ import { isWithinClockTolerance } from '../clock_tolerance.js';
5
+ export class ProposalValidator {
6
+ epochCache;
7
+ logger;
8
+ txsPermitted;
9
+ constructor(epochCache, opts, loggerName){
10
+ this.epochCache = epochCache;
11
+ this.txsPermitted = opts.txsPermitted;
12
+ this.logger = createLogger(loggerName);
13
+ }
14
+ async validate(proposal) {
15
+ try {
16
+ // Slot check
17
+ const { currentSlot, nextSlot } = this.epochCache.getCurrentAndNextSlot();
18
+ const slotNumber = proposal.slotNumber;
19
+ if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
20
+ // Check if message is for previous slot and within clock tolerance
21
+ if (!isWithinClockTolerance(slotNumber, currentSlot, this.epochCache)) {
22
+ this.logger.debug(`Penalizing peer for invalid slot number ${slotNumber}`, {
23
+ currentSlot,
24
+ nextSlot
25
+ });
26
+ return {
27
+ result: 'reject',
28
+ severity: PeerErrorSeverity.HighToleranceError
29
+ };
30
+ }
31
+ this.logger.debug(`Ignoring proposal for previous slot ${slotNumber} within clock tolerance`);
32
+ return {
33
+ result: 'ignore'
34
+ };
35
+ }
36
+ // Signature validity
37
+ const proposer = proposal.getSender();
38
+ if (!proposer) {
39
+ this.logger.debug(`Penalizing peer for proposal with invalid signature`);
40
+ return {
41
+ result: 'reject',
42
+ severity: PeerErrorSeverity.MidToleranceError
43
+ };
44
+ }
45
+ // Transactions permitted check
46
+ const embeddedTxCount = proposal.txs?.length ?? 0;
47
+ if (!this.txsPermitted && (proposal.txHashes.length > 0 || embeddedTxCount > 0)) {
48
+ this.logger.debug(`Penalizing peer for proposal with ${proposal.txHashes.length} transaction(s) when transactions are not permitted`);
49
+ return {
50
+ result: 'reject',
51
+ severity: PeerErrorSeverity.MidToleranceError
52
+ };
53
+ }
54
+ // Embedded txs must be listed in txHashes
55
+ const hashSet = new Set(proposal.txHashes.map((h)=>h.toString()));
56
+ const missingTxHashes = embeddedTxCount > 0 ? proposal.txs.filter((tx)=>!hashSet.has(tx.getTxHash().toString())).map((tx)=>tx.getTxHash().toString()) : [];
57
+ if (embeddedTxCount > 0 && missingTxHashes.length > 0) {
58
+ this.logger.warn('Penalizing peer for embedded transaction(s) not included in txHashes', {
59
+ embeddedTxCount,
60
+ txHashesLength: proposal.txHashes.length,
61
+ missingTxHashes
62
+ });
63
+ return {
64
+ result: 'reject',
65
+ severity: PeerErrorSeverity.MidToleranceError
66
+ };
67
+ }
68
+ // Proposer check
69
+ const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
70
+ if (expectedProposer !== undefined && !proposer.equals(expectedProposer)) {
71
+ this.logger.debug(`Penalizing peer for invalid proposer for current slot ${slotNumber}`, {
72
+ expectedProposer,
73
+ proposer: proposer.toString()
74
+ });
75
+ return {
76
+ result: 'reject',
77
+ severity: PeerErrorSeverity.MidToleranceError
78
+ };
79
+ }
80
+ // Validate tx hashes for all txs embedded in the proposal
81
+ if (!(await Promise.all(proposal.txs?.map((tx)=>tx.validateTxHash()) ?? [])).every((v)=>v)) {
82
+ this.logger.warn(`Penalizing peer for invalid tx hashes in proposal`, {
83
+ proposer,
84
+ slotNumber
85
+ });
86
+ return {
87
+ result: 'reject',
88
+ severity: PeerErrorSeverity.LowToleranceError
89
+ };
90
+ }
91
+ return {
92
+ result: 'accept'
93
+ };
94
+ } catch (e) {
95
+ if (e instanceof NoCommitteeError) {
96
+ return {
97
+ result: 'reject',
98
+ severity: PeerErrorSeverity.LowToleranceError
99
+ };
100
+ }
101
+ throw e;
102
+ }
103
+ }
104
+ }
@@ -0,0 +1,23 @@
1
+ import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
+ import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
3
+ import type { EthAddress } from '@aztec/foundation/eth-address';
4
+ import { type BlockProposal, type CheckpointProposal, type ValidationResult } from '@aztec/stdlib/p2p';
5
+ import type { TxHash } from '@aztec/stdlib/tx';
6
+ import type { MockProxy } from 'jest-mock-extended';
7
+ export interface ProposalValidatorTestParams<TProposal extends BlockProposal | CheckpointProposal> {
8
+ validatorFactory: (epochCache: EpochCacheInterface, opts: {
9
+ txsPermitted: boolean;
10
+ }) => {
11
+ validate: (proposal: TProposal) => Promise<ValidationResult>;
12
+ };
13
+ makeProposal: (options?: any) => Promise<TProposal>;
14
+ makeHeader: (epochNumber: number | bigint, slotNumber: number | bigint, blockNumber: number | bigint) => any;
15
+ getSigner: () => Secp256k1Signer;
16
+ getAddress: (signer?: Secp256k1Signer) => EthAddress;
17
+ getSlot: (slot: number | bigint) => any;
18
+ getTxHashes: (n: number) => TxHash[];
19
+ getTxs: () => any[];
20
+ epochCacheMock: () => MockProxy<EpochCacheInterface>;
21
+ }
22
+ export declare function sharedProposalValidatorTests<TProposal extends BlockProposal | CheckpointProposal>(params: ProposalValidatorTestParams<TProposal>): void;
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvcHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQsTUFBTSxXQUFXLDJCQUEyQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQy9GLGdCQUFnQixFQUFFLENBQ2hCLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEtBQzVCO1FBQUUsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLFNBQVMsS0FBSyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtLQUFFLENBQUM7SUFDdEUsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRyxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwRCxVQUFVLEVBQUUsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sS0FBSyxHQUFHLENBQUM7SUFDN0csU0FBUyxFQUFFLE1BQU0sZUFBZSxDQUFDO0lBQ2pDLFVBQVUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGVBQWUsS0FBSyxVQUFVLENBQUM7SUFDckQsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLEtBQUssR0FBRyxDQUFDO0lBQ3hDLFdBQVcsRUFBRSxDQUFDLENBQUMsRUFBRSxNQUFNLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDckMsTUFBTSxFQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFDcEIsY0FBYyxFQUFFLE1BQU0sU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7Q0FDdEQ7QUFFRCx3QkFBZ0IsNEJBQTRCLENBQUMsU0FBUyxTQUFTLGFBQWEsR0FBRyxrQkFBa0IsRUFDL0YsTUFBTSxFQUFFLDJCQUEyQixDQUFDLFNBQVMsQ0FBQyxRQXdNL0MifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"proposal_validator_test_suite.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator_test_suite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,2BAA2B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC/F,gBAAgB,EAAE,CAChB,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,KAC5B;QAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACtE,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IAC7G,SAAS,EAAE,MAAM,eAAe,CAAC;IACjC,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,UAAU,CAAC;IACrD,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IACxC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACrC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC;CACtD;AAED,wBAAgB,4BAA4B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB,EAC/F,MAAM,EAAE,2BAA2B,CAAC,SAAS,CAAC,QAwM/C"}