@aztec/stdlib 0.0.1-commit.f295ac2 → 0.0.1-commit.f504929

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 (491) hide show
  1. package/dest/abi/decoder.d.ts +2 -2
  2. package/dest/abi/decoder.d.ts.map +1 -1
  3. package/dest/abi/decoder.js +7 -5
  4. package/dest/abi/encoder.d.ts +1 -1
  5. package/dest/abi/encoder.d.ts.map +1 -1
  6. package/dest/abi/encoder.js +37 -6
  7. package/dest/abi/event_metadata_definition.d.ts +3 -1
  8. package/dest/abi/event_metadata_definition.d.ts.map +1 -1
  9. package/dest/abi/event_metadata_definition.js +1 -1
  10. package/dest/abi/function_call.d.ts +39 -9
  11. package/dest/abi/function_call.d.ts.map +1 -1
  12. package/dest/abi/function_call.js +20 -3
  13. package/dest/abi/utils.d.ts +14 -1
  14. package/dest/abi/utils.d.ts.map +1 -1
  15. package/dest/abi/utils.js +15 -0
  16. package/dest/auth_witness/auth_witness.js +3 -3
  17. package/dest/avm/avm.d.ts +300 -300
  18. package/dest/avm/avm_proving_request.d.ts +166 -166
  19. package/dest/avm/revert_code.d.ts +16 -1
  20. package/dest/avm/revert_code.d.ts.map +1 -1
  21. package/dest/avm/revert_code.js +15 -5
  22. package/dest/block/block_data.d.ts +52 -0
  23. package/dest/block/block_data.d.ts.map +1 -0
  24. package/dest/block/block_data.js +12 -0
  25. package/dest/block/block_hash.d.ts +16 -18
  26. package/dest/block/block_hash.d.ts.map +1 -1
  27. package/dest/block/block_hash.js +21 -31
  28. package/dest/block/block_parameter.d.ts +4 -4
  29. package/dest/block/block_parameter.d.ts.map +1 -1
  30. package/dest/block/block_parameter.js +2 -2
  31. package/dest/block/checkpointed_l2_block.d.ts +6 -6
  32. package/dest/block/checkpointed_l2_block.d.ts.map +1 -1
  33. package/dest/block/checkpointed_l2_block.js +3 -3
  34. package/dest/block/in_block.d.ts +11 -11
  35. package/dest/block/in_block.d.ts.map +1 -1
  36. package/dest/block/in_block.js +5 -5
  37. package/dest/block/index.d.ts +3 -2
  38. package/dest/block/index.d.ts.map +1 -1
  39. package/dest/block/index.js +2 -1
  40. package/dest/block/{l2_block_new.d.ts → l2_block.d.ts} +8 -7
  41. package/dest/block/l2_block.d.ts.map +1 -0
  42. package/dest/block/{l2_block_new.js → l2_block.js} +5 -9
  43. package/dest/block/l2_block_source.d.ts +58 -30
  44. package/dest/block/l2_block_source.d.ts.map +1 -1
  45. package/dest/block/l2_block_stream/interfaces.d.ts +3 -3
  46. package/dest/block/l2_block_stream/interfaces.d.ts.map +1 -1
  47. package/dest/block/l2_block_stream/l2_block_stream.d.ts +6 -3
  48. package/dest/block/l2_block_stream/l2_block_stream.d.ts.map +1 -1
  49. package/dest/block/l2_block_stream/l2_block_stream.js +47 -25
  50. package/dest/block/l2_block_stream/l2_tips_store_base.d.ts +3 -3
  51. package/dest/block/l2_block_stream/l2_tips_store_base.d.ts.map +1 -1
  52. package/dest/block/test/l2_tips_store_test_suite.js +2 -2
  53. package/dest/checkpoint/checkpoint.d.ts +27 -13
  54. package/dest/checkpoint/checkpoint.d.ts.map +1 -1
  55. package/dest/checkpoint/checkpoint.js +27 -16
  56. package/dest/checkpoint/checkpoint_data.d.ts +120 -0
  57. package/dest/checkpoint/checkpoint_data.d.ts.map +1 -0
  58. package/dest/checkpoint/checkpoint_data.js +26 -0
  59. package/dest/checkpoint/index.d.ts +2 -1
  60. package/dest/checkpoint/index.d.ts.map +1 -1
  61. package/dest/checkpoint/index.js +1 -0
  62. package/dest/checkpoint/published_checkpoint.d.ts +19 -4
  63. package/dest/checkpoint/published_checkpoint.d.ts.map +1 -1
  64. package/dest/checkpoint/published_checkpoint.js +1 -2
  65. package/dest/config/index.d.ts +2 -1
  66. package/dest/config/index.d.ts.map +1 -1
  67. package/dest/config/index.js +1 -0
  68. package/dest/config/node-rpc-config.js +1 -1
  69. package/dest/config/sequencer-config.d.ts +12 -0
  70. package/dest/config/sequencer-config.d.ts.map +1 -0
  71. package/dest/config/sequencer-config.js +25 -0
  72. package/dest/contract/contract_address.js +4 -4
  73. package/dest/contract/contract_class.d.ts +2 -3
  74. package/dest/contract/contract_class.d.ts.map +1 -1
  75. package/dest/contract/contract_class_id.d.ts +2 -2
  76. package/dest/contract/contract_class_id.d.ts.map +1 -1
  77. package/dest/contract/contract_class_id.js +6 -5
  78. package/dest/contract/interfaces/node-info.d.ts +3 -1
  79. package/dest/contract/interfaces/node-info.d.ts.map +1 -1
  80. package/dest/contract/interfaces/node-info.js +2 -1
  81. package/dest/contract/private_function.d.ts +1 -1
  82. package/dest/contract/private_function.d.ts.map +1 -1
  83. package/dest/contract/private_function.js +3 -4
  84. package/dest/contract/private_function_membership_proof.d.ts +1 -1
  85. package/dest/contract/private_function_membership_proof.js +1 -1
  86. package/dest/database-version/database_version.d.ts +58 -0
  87. package/dest/database-version/database_version.d.ts.map +1 -0
  88. package/dest/database-version/database_version.js +69 -0
  89. package/dest/database-version/version_manager.d.ts +2 -50
  90. package/dest/database-version/version_manager.d.ts.map +1 -1
  91. package/dest/database-version/version_manager.js +1 -66
  92. package/dest/delayed_public_mutable/delayed_public_mutable_values.d.ts +2 -2
  93. package/dest/delayed_public_mutable/delayed_public_mutable_values.d.ts.map +1 -1
  94. package/dest/delayed_public_mutable/delayed_public_mutable_values.js +7 -10
  95. package/dest/epoch-helpers/index.d.ts +7 -1
  96. package/dest/epoch-helpers/index.d.ts.map +1 -1
  97. package/dest/epoch-helpers/index.js +9 -3
  98. package/dest/file-store/local.d.ts +3 -3
  99. package/dest/file-store/local.d.ts.map +1 -1
  100. package/dest/file-store/local.js +13 -4
  101. package/dest/file-store/s3.d.ts +1 -1
  102. package/dest/file-store/s3.d.ts.map +1 -1
  103. package/dest/file-store/s3.js +11 -3
  104. package/dest/gas/gas_fees.d.ts +1 -1
  105. package/dest/gas/gas_fees.d.ts.map +1 -1
  106. package/dest/gas/gas_fees.js +4 -1
  107. package/dest/ha-signing/config.d.ts +101 -0
  108. package/dest/ha-signing/config.d.ts.map +1 -0
  109. package/dest/ha-signing/config.js +92 -0
  110. package/dest/ha-signing/index.d.ts +3 -0
  111. package/dest/ha-signing/index.d.ts.map +1 -0
  112. package/dest/ha-signing/index.js +2 -0
  113. package/dest/ha-signing/types.d.ts +85 -0
  114. package/dest/ha-signing/types.d.ts.map +1 -0
  115. package/dest/ha-signing/types.js +32 -0
  116. package/dest/hash/hash.d.ts +2 -1
  117. package/dest/hash/hash.d.ts.map +1 -1
  118. package/dest/hash/hash.js +16 -10
  119. package/dest/hash/map_slot.d.ts +1 -1
  120. package/dest/hash/map_slot.d.ts.map +1 -1
  121. package/dest/hash/map_slot.js +4 -3
  122. package/dest/interfaces/allowed_element.d.ts +2 -20
  123. package/dest/interfaces/allowed_element.d.ts.map +1 -1
  124. package/dest/interfaces/allowed_element.js +0 -6
  125. package/dest/interfaces/api_limit.d.ts +2 -1
  126. package/dest/interfaces/api_limit.d.ts.map +1 -1
  127. package/dest/interfaces/api_limit.js +1 -0
  128. package/dest/interfaces/archiver.d.ts +1 -1
  129. package/dest/interfaces/archiver.d.ts.map +1 -1
  130. package/dest/interfaces/archiver.js +24 -18
  131. package/dest/interfaces/aztec-node-admin.d.ts +61 -29
  132. package/dest/interfaces/aztec-node-admin.d.ts.map +1 -1
  133. package/dest/interfaces/aztec-node-admin.js +12 -4
  134. package/dest/interfaces/aztec-node.d.ts +65 -63
  135. package/dest/interfaces/aztec-node.d.ts.map +1 -1
  136. package/dest/interfaces/aztec-node.js +13 -17
  137. package/dest/interfaces/block-builder.d.ts +14 -8
  138. package/dest/interfaces/block-builder.d.ts.map +1 -1
  139. package/dest/interfaces/block-builder.js +8 -1
  140. package/dest/interfaces/configs.d.ts +33 -28
  141. package/dest/interfaces/configs.d.ts.map +1 -1
  142. package/dest/interfaces/configs.js +7 -2
  143. package/dest/interfaces/get_logs_response.d.ts +15 -8
  144. package/dest/interfaces/get_logs_response.d.ts.map +1 -1
  145. package/dest/interfaces/l2_logs_source.d.ts +14 -5
  146. package/dest/interfaces/l2_logs_source.d.ts.map +1 -1
  147. package/dest/interfaces/merkle_tree_operations.d.ts +2 -2
  148. package/dest/interfaces/merkle_tree_operations.d.ts.map +1 -1
  149. package/dest/interfaces/p2p.d.ts +4 -9
  150. package/dest/interfaces/p2p.d.ts.map +1 -1
  151. package/dest/interfaces/prover-broker.d.ts +16 -1
  152. package/dest/interfaces/prover-broker.d.ts.map +1 -1
  153. package/dest/interfaces/prover-broker.js +4 -1
  154. package/dest/interfaces/prover-client.d.ts +15 -1
  155. package/dest/interfaces/prover-client.d.ts.map +1 -1
  156. package/dest/interfaces/prover-client.js +12 -1
  157. package/dest/interfaces/proving-job.d.ts +202 -202
  158. package/dest/interfaces/slasher.d.ts +9 -1
  159. package/dest/interfaces/slasher.d.ts.map +1 -1
  160. package/dest/interfaces/slasher.js +2 -0
  161. package/dest/interfaces/tx_provider.d.ts +3 -3
  162. package/dest/interfaces/tx_provider.d.ts.map +1 -1
  163. package/dest/interfaces/validator.d.ts +58 -29
  164. package/dest/interfaces/validator.d.ts.map +1 -1
  165. package/dest/interfaces/validator.js +7 -3
  166. package/dest/kernel/hints/build_note_hash_read_request_hints.d.ts +3 -3
  167. package/dest/kernel/hints/build_note_hash_read_request_hints.d.ts.map +1 -1
  168. package/dest/kernel/hints/build_note_hash_read_request_hints.js +13 -10
  169. package/dest/kernel/hints/build_nullifier_read_request_hints.d.ts +4 -4
  170. package/dest/kernel/hints/build_nullifier_read_request_hints.d.ts.map +1 -1
  171. package/dest/kernel/hints/build_nullifier_read_request_hints.js +16 -15
  172. package/dest/kernel/hints/build_transient_data_hints.d.ts +5 -2
  173. package/dest/kernel/hints/build_transient_data_hints.d.ts.map +1 -1
  174. package/dest/kernel/hints/build_transient_data_hints.js +9 -3
  175. package/dest/kernel/hints/index.d.ts +2 -2
  176. package/dest/kernel/hints/index.js +2 -2
  177. package/dest/kernel/hints/key_validation_request_and_separator.d.ts +24 -0
  178. package/dest/kernel/hints/key_validation_request_and_separator.d.ts.map +1 -0
  179. package/dest/kernel/hints/{key_validation_request_and_generator.js → key_validation_request_and_separator.js} +12 -15
  180. package/dest/kernel/hints/{scoped_key_validation_request_and_generator.d.ts → scoped_key_validation_request_and_separator.d.ts} +8 -8
  181. package/dest/kernel/hints/{scoped_key_validation_request_and_generator.d.ts.map → scoped_key_validation_request_and_separator.d.ts.map} +1 -1
  182. package/dest/kernel/hints/{scoped_key_validation_request_and_generator.js → scoped_key_validation_request_and_separator.js} +6 -6
  183. package/dest/kernel/private_circuit_public_inputs.d.ts +9 -9
  184. package/dest/kernel/private_circuit_public_inputs.d.ts.map +1 -1
  185. package/dest/kernel/private_circuit_public_inputs.js +16 -16
  186. package/dest/kernel/private_kernel_circuit_public_inputs.d.ts +3 -3
  187. package/dest/kernel/private_kernel_circuit_public_inputs.d.ts.map +1 -1
  188. package/dest/kernel/private_kernel_circuit_public_inputs.js +4 -4
  189. package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts +3 -3
  190. package/dest/kernel/private_kernel_tail_circuit_private_inputs.d.ts.map +1 -1
  191. package/dest/kernel/private_kernel_tail_circuit_private_inputs.js +4 -4
  192. package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts +3 -3
  193. package/dest/kernel/private_kernel_tail_circuit_public_inputs.d.ts.map +1 -1
  194. package/dest/kernel/private_kernel_tail_circuit_public_inputs.js +7 -7
  195. package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts +3 -3
  196. package/dest/kernel/private_to_public_kernel_circuit_public_inputs.d.ts.map +1 -1
  197. package/dest/kernel/private_to_public_kernel_circuit_public_inputs.js +7 -7
  198. package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts +3 -3
  199. package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.d.ts.map +1 -1
  200. package/dest/kernel/private_to_rollup_kernel_circuit_public_inputs.js +7 -7
  201. package/dest/kernel/private_validation_requests.d.ts +3 -3
  202. package/dest/kernel/private_validation_requests.js +9 -9
  203. package/dest/keys/derivation.d.ts +3 -3
  204. package/dest/keys/derivation.js +15 -15
  205. package/dest/keys/key_types.d.ts +3 -3
  206. package/dest/keys/key_types.d.ts.map +1 -1
  207. package/dest/keys/public_keys.js +2 -2
  208. package/dest/keys/utils.d.ts +1 -1
  209. package/dest/keys/utils.d.ts.map +1 -1
  210. package/dest/keys/utils.js +8 -4
  211. package/dest/l1-contracts/slash_factory.d.ts +1 -1
  212. package/dest/l1-contracts/slash_factory.d.ts.map +1 -1
  213. package/dest/l1-contracts/slash_factory.js +1 -0
  214. package/dest/logs/debug_log_store.d.ts +30 -0
  215. package/dest/logs/debug_log_store.d.ts.map +1 -0
  216. package/dest/logs/debug_log_store.js +30 -0
  217. package/dest/logs/extended_directional_app_tagging_secret.d.ts +47 -0
  218. package/dest/logs/extended_directional_app_tagging_secret.d.ts.map +1 -0
  219. package/dest/logs/{directional_app_tagging_secret.js → extended_directional_app_tagging_secret.js} +23 -15
  220. package/dest/logs/extended_public_log.d.ts +13 -7
  221. package/dest/logs/extended_public_log.d.ts.map +1 -1
  222. package/dest/logs/index.d.ts +3 -2
  223. package/dest/logs/index.d.ts.map +1 -1
  224. package/dest/logs/index.js +2 -1
  225. package/dest/logs/log_id.d.ts +17 -14
  226. package/dest/logs/log_id.d.ts.map +1 -1
  227. package/dest/logs/log_id.js +20 -17
  228. package/dest/logs/pre_tag.d.ts +16 -11
  229. package/dest/logs/pre_tag.d.ts.map +1 -1
  230. package/dest/logs/pre_tag.js +2 -2
  231. package/dest/logs/private_log.d.ts +2 -2
  232. package/dest/logs/private_log.d.ts.map +1 -1
  233. package/dest/logs/public_log.d.ts +4 -3
  234. package/dest/logs/public_log.d.ts.map +1 -1
  235. package/dest/logs/public_log.js +2 -1
  236. package/dest/logs/siloed_tag.d.ts +5 -3
  237. package/dest/logs/siloed_tag.d.ts.map +1 -1
  238. package/dest/logs/siloed_tag.js +8 -6
  239. package/dest/logs/tag.js +1 -1
  240. package/dest/messaging/l2_to_l1_membership.d.ts +2 -2
  241. package/dest/messaging/l2_to_l1_membership.js +3 -3
  242. package/dest/note/index.d.ts +1 -2
  243. package/dest/note/index.d.ts.map +1 -1
  244. package/dest/note/index.js +0 -1
  245. package/dest/p2p/attestation_utils.d.ts +11 -1
  246. package/dest/p2p/attestation_utils.d.ts.map +1 -1
  247. package/dest/p2p/attestation_utils.js +45 -0
  248. package/dest/p2p/block_proposal.d.ts +14 -7
  249. package/dest/p2p/block_proposal.d.ts.map +1 -1
  250. package/dest/p2p/block_proposal.js +3 -5
  251. package/dest/p2p/checkpoint_attestation.d.ts +2 -1
  252. package/dest/p2p/checkpoint_attestation.d.ts.map +1 -1
  253. package/dest/p2p/checkpoint_attestation.js +1 -1
  254. package/dest/p2p/checkpoint_proposal.d.ts +27 -8
  255. package/dest/p2p/checkpoint_proposal.d.ts.map +1 -1
  256. package/dest/p2p/checkpoint_proposal.js +30 -16
  257. package/dest/p2p/client_type.d.ts +2 -5
  258. package/dest/p2p/client_type.d.ts.map +1 -1
  259. package/dest/p2p/client_type.js +0 -7
  260. package/dest/p2p/consensus_payload.d.ts +12 -3
  261. package/dest/p2p/consensus_payload.d.ts.map +1 -1
  262. package/dest/p2p/consensus_payload.js +22 -15
  263. package/dest/p2p/constants.d.ts +5 -0
  264. package/dest/p2p/constants.d.ts.map +1 -0
  265. package/dest/p2p/constants.js +3 -0
  266. package/dest/p2p/index.d.ts +2 -2
  267. package/dest/p2p/index.d.ts.map +1 -1
  268. package/dest/p2p/index.js +1 -1
  269. package/dest/p2p/message_validator.d.ts +18 -3
  270. package/dest/p2p/message_validator.d.ts.map +1 -1
  271. package/dest/p2p/message_validator.js +2 -1
  272. package/dest/p2p/topic_type.d.ts +3 -4
  273. package/dest/p2p/topic_type.d.ts.map +1 -1
  274. package/dest/p2p/topic_type.js +7 -24
  275. package/dest/rollup/checkpoint_header.d.ts +2 -2
  276. package/dest/rollup/checkpoint_header.js +2 -2
  277. package/dest/rollup/checkpoint_rollup_public_inputs.d.ts +6 -6
  278. package/dest/rollup/checkpoint_rollup_public_inputs.d.ts.map +1 -1
  279. package/dest/rollup/checkpoint_rollup_public_inputs.js +2 -2
  280. package/dest/rollup/checkpoint_root_rollup_private_inputs.d.ts +2 -2
  281. package/dest/rollup/checkpoint_root_rollup_private_inputs.d.ts.map +1 -1
  282. package/dest/rollup/root_rollup_public_inputs.d.ts +6 -6
  283. package/dest/rollup/root_rollup_public_inputs.d.ts.map +1 -1
  284. package/dest/rollup/root_rollup_public_inputs.js +3 -3
  285. package/dest/slashing/empire.d.ts +1 -1
  286. package/dest/slashing/empire.d.ts.map +1 -1
  287. package/dest/slashing/empire.js +2 -0
  288. package/dest/slashing/helpers.d.ts +2 -2
  289. package/dest/slashing/helpers.d.ts.map +1 -1
  290. package/dest/slashing/helpers.js +6 -0
  291. package/dest/slashing/tally.d.ts +9 -2
  292. package/dest/slashing/tally.d.ts.map +1 -1
  293. package/dest/slashing/tally.js +26 -3
  294. package/dest/slashing/types.d.ts +7 -3
  295. package/dest/slashing/types.d.ts.map +1 -1
  296. package/dest/slashing/types.js +13 -1
  297. package/dest/stats/stats.d.ts +1 -3
  298. package/dest/stats/stats.d.ts.map +1 -1
  299. package/dest/tests/factories.d.ts +3 -1
  300. package/dest/tests/factories.d.ts.map +1 -1
  301. package/dest/tests/factories.js +22 -14
  302. package/dest/tests/jest.d.ts +4 -4
  303. package/dest/tests/jest.js +9 -9
  304. package/dest/tests/mocks.d.ts +19 -11
  305. package/dest/tests/mocks.d.ts.map +1 -1
  306. package/dest/tests/mocks.js +37 -26
  307. package/dest/timetable/index.d.ts +37 -0
  308. package/dest/timetable/index.d.ts.map +1 -0
  309. package/dest/timetable/index.js +39 -0
  310. package/dest/trees/public_data_leaf.d.ts +2 -1
  311. package/dest/trees/public_data_leaf.d.ts.map +1 -1
  312. package/dest/trees/public_data_leaf.js +7 -6
  313. package/dest/tx/block_header.d.ts +3 -2
  314. package/dest/tx/block_header.d.ts.map +1 -1
  315. package/dest/tx/block_header.js +4 -3
  316. package/dest/tx/global_variables.d.ts +4 -4
  317. package/dest/tx/global_variables.d.ts.map +1 -1
  318. package/dest/tx/in_tx.d.ts +3 -3
  319. package/dest/tx/indexed_tx_effect.d.ts +5 -5
  320. package/dest/tx/indexed_tx_effect.d.ts.map +1 -1
  321. package/dest/tx/indexed_tx_effect.js +3 -2
  322. package/dest/tx/profiling.d.ts +4 -4
  323. package/dest/tx/profiling.d.ts.map +1 -1
  324. package/dest/tx/profiling.js +3 -3
  325. package/dest/tx/protocol_contracts.d.ts +1 -1
  326. package/dest/tx/protocol_contracts.d.ts.map +1 -1
  327. package/dest/tx/protocol_contracts.js +2 -2
  328. package/dest/tx/public_simulation_output.d.ts +4 -2
  329. package/dest/tx/public_simulation_output.d.ts.map +1 -1
  330. package/dest/tx/public_simulation_output.js +7 -3
  331. package/dest/tx/simulated_tx.d.ts +5 -2
  332. package/dest/tx/simulated_tx.d.ts.map +1 -1
  333. package/dest/tx/simulated_tx.js +4 -1
  334. package/dest/tx/tx.d.ts +2 -1
  335. package/dest/tx/tx.d.ts.map +1 -1
  336. package/dest/tx/tx.js +6 -3
  337. package/dest/tx/tx_receipt.d.ts +57 -15
  338. package/dest/tx/tx_receipt.d.ts.map +1 -1
  339. package/dest/tx/tx_receipt.js +55 -16
  340. package/dest/tx/tx_request.js +2 -2
  341. package/dest/tx/validator/empty_validator.d.ts +2 -2
  342. package/dest/tx/validator/empty_validator.d.ts.map +1 -1
  343. package/dest/tx/validator/error_texts.d.ts +4 -2
  344. package/dest/tx/validator/error_texts.d.ts.map +1 -1
  345. package/dest/tx/validator/error_texts.js +4 -1
  346. package/dest/tx/validator/tx_validator.d.ts +2 -2
  347. package/dest/tx/validator/tx_validator.d.ts.map +1 -1
  348. package/dest/validators/schemas.d.ts +30 -30
  349. package/dest/validators/schemas.d.ts.map +1 -1
  350. package/dest/validators/schemas.js +4 -3
  351. package/dest/validators/types.d.ts +3 -3
  352. package/dest/validators/types.d.ts.map +1 -1
  353. package/package.json +25 -13
  354. package/src/abi/decoder.ts +15 -6
  355. package/src/abi/encoder.ts +49 -6
  356. package/src/abi/event_metadata_definition.ts +2 -0
  357. package/src/abi/function_call.ts +25 -3
  358. package/src/abi/utils.ts +25 -0
  359. package/src/auth_witness/auth_witness.ts +3 -3
  360. package/src/avm/revert_code.ts +15 -0
  361. package/src/block/block_data.ts +26 -0
  362. package/src/block/block_hash.ts +26 -47
  363. package/src/block/block_parameter.ts +3 -3
  364. package/src/block/checkpointed_l2_block.ts +4 -4
  365. package/src/block/in_block.ts +8 -8
  366. package/src/block/index.ts +2 -1
  367. package/src/block/{l2_block_new.ts → l2_block.ts} +8 -12
  368. package/src/block/l2_block_source.ts +62 -31
  369. package/src/block/l2_block_stream/interfaces.ts +2 -2
  370. package/src/block/l2_block_stream/l2_block_stream.ts +65 -27
  371. package/src/block/l2_block_stream/l2_tips_store_base.ts +2 -2
  372. package/src/block/test/l2_tips_store_test_suite.ts +4 -4
  373. package/src/checkpoint/checkpoint.ts +38 -20
  374. package/src/checkpoint/checkpoint_data.ts +51 -0
  375. package/src/checkpoint/index.ts +1 -0
  376. package/src/checkpoint/published_checkpoint.ts +3 -1
  377. package/src/config/index.ts +1 -0
  378. package/src/config/node-rpc-config.ts +1 -1
  379. package/src/config/sequencer-config.ts +37 -0
  380. package/src/contract/contract_address.ts +4 -4
  381. package/src/contract/contract_class.ts +3 -3
  382. package/src/contract/contract_class_id.ts +6 -5
  383. package/src/contract/interfaces/node-info.ts +3 -0
  384. package/src/contract/private_function.ts +3 -4
  385. package/src/contract/private_function_membership_proof.ts +1 -1
  386. package/src/database-version/database_version.ts +87 -0
  387. package/src/database-version/version_manager.ts +1 -77
  388. package/src/delayed_public_mutable/delayed_public_mutable_values.ts +9 -10
  389. package/src/epoch-helpers/index.ts +13 -1
  390. package/src/file-store/local.ts +15 -5
  391. package/src/file-store/s3.ts +12 -3
  392. package/src/gas/gas_fees.ts +7 -1
  393. package/src/ha-signing/config.ts +149 -0
  394. package/src/ha-signing/index.ts +18 -0
  395. package/src/ha-signing/types.ts +112 -0
  396. package/src/hash/hash.ts +14 -10
  397. package/src/hash/map_slot.ts +3 -2
  398. package/src/interfaces/allowed_element.ts +1 -5
  399. package/src/interfaces/api_limit.ts +1 -0
  400. package/src/interfaces/archiver.ts +24 -27
  401. package/src/interfaces/aztec-node-admin.ts +26 -2
  402. package/src/interfaces/aztec-node.ts +90 -121
  403. package/src/interfaces/block-builder.ts +21 -7
  404. package/src/interfaces/configs.ts +23 -8
  405. package/src/interfaces/l2_logs_source.ts +17 -4
  406. package/src/interfaces/merkle_tree_operations.ts +1 -1
  407. package/src/interfaces/p2p.ts +3 -14
  408. package/src/interfaces/prover-broker.ts +22 -0
  409. package/src/interfaces/prover-client.ts +22 -0
  410. package/src/interfaces/slasher.ts +4 -0
  411. package/src/interfaces/tx_provider.ts +2 -2
  412. package/src/interfaces/validator.ts +17 -8
  413. package/src/kernel/hints/build_note_hash_read_request_hints.ts +14 -18
  414. package/src/kernel/hints/build_nullifier_read_request_hints.ts +16 -28
  415. package/src/kernel/hints/build_transient_data_hints.ts +17 -2
  416. package/src/kernel/hints/index.ts +2 -2
  417. package/src/kernel/hints/{key_validation_request_and_generator.ts → key_validation_request_and_separator.ts} +12 -15
  418. package/src/kernel/hints/{scoped_key_validation_request_and_generator.ts → scoped_key_validation_request_and_separator.ts} +10 -10
  419. package/src/kernel/private_circuit_public_inputs.ts +14 -14
  420. package/src/kernel/private_kernel_circuit_public_inputs.ts +2 -2
  421. package/src/kernel/private_kernel_tail_circuit_private_inputs.ts +2 -2
  422. package/src/kernel/private_kernel_tail_circuit_public_inputs.ts +5 -5
  423. package/src/kernel/private_to_public_kernel_circuit_public_inputs.ts +5 -5
  424. package/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts +5 -5
  425. package/src/kernel/private_validation_requests.ts +8 -8
  426. package/src/keys/derivation.ts +15 -15
  427. package/src/keys/key_types.ts +6 -2
  428. package/src/keys/public_keys.ts +2 -2
  429. package/src/keys/utils.ts +8 -4
  430. package/src/l1-contracts/slash_factory.ts +1 -0
  431. package/src/logs/debug_log_store.ts +54 -0
  432. package/src/logs/{directional_app_tagging_secret.ts → extended_directional_app_tagging_secret.ts} +24 -16
  433. package/src/logs/index.ts +2 -1
  434. package/src/logs/log_id.ts +22 -18
  435. package/src/logs/pre_tag.ts +5 -5
  436. package/src/logs/public_log.ts +4 -2
  437. package/src/logs/siloed_tag.ts +10 -4
  438. package/src/logs/tag.ts +1 -1
  439. package/src/messaging/l2_to_l1_membership.ts +3 -3
  440. package/src/note/index.ts +0 -1
  441. package/src/p2p/attestation_utils.ts +56 -0
  442. package/src/p2p/block_proposal.ts +13 -8
  443. package/src/p2p/checkpoint_attestation.ts +6 -1
  444. package/src/p2p/checkpoint_proposal.ts +55 -16
  445. package/src/p2p/client_type.ts +0 -6
  446. package/src/p2p/consensus_payload.ts +25 -12
  447. package/src/p2p/constants.ts +6 -0
  448. package/src/p2p/index.ts +1 -1
  449. package/src/p2p/message_validator.ts +14 -2
  450. package/src/p2p/topic_type.ts +8 -15
  451. package/src/rollup/checkpoint_header.ts +2 -2
  452. package/src/rollup/checkpoint_rollup_public_inputs.ts +5 -5
  453. package/src/rollup/root_rollup_public_inputs.ts +7 -7
  454. package/src/slashing/empire.ts +3 -1
  455. package/src/slashing/helpers.ts +8 -0
  456. package/src/slashing/tally.ts +25 -4
  457. package/src/slashing/types.ts +14 -0
  458. package/src/stats/stats.ts +0 -2
  459. package/src/tests/factories.ts +27 -18
  460. package/src/tests/jest.ts +9 -9
  461. package/src/tests/mocks.ts +54 -30
  462. package/src/timetable/index.ts +66 -0
  463. package/src/trees/public_data_leaf.ts +11 -5
  464. package/src/tx/block_header.ts +8 -5
  465. package/src/tx/global_variables.ts +3 -3
  466. package/src/tx/indexed_tx_effect.ts +3 -2
  467. package/src/tx/profiling.ts +5 -5
  468. package/src/tx/protocol_contracts.ts +2 -2
  469. package/src/tx/public_simulation_output.ts +4 -0
  470. package/src/tx/simulated_tx.ts +8 -1
  471. package/src/tx/tx.ts +8 -9
  472. package/src/tx/tx_receipt.ts +85 -18
  473. package/src/tx/tx_request.ts +2 -2
  474. package/src/tx/validator/empty_validator.ts +1 -1
  475. package/src/tx/validator/error_texts.ts +5 -1
  476. package/src/tx/validator/tx_validator.ts +1 -1
  477. package/src/validators/schemas.ts +8 -1
  478. package/src/validators/types.ts +5 -4
  479. package/dest/block/l2_block_new.d.ts.map +0 -1
  480. package/dest/database-version/index.d.ts +0 -2
  481. package/dest/database-version/index.d.ts.map +0 -1
  482. package/dest/database-version/index.js +0 -1
  483. package/dest/kernel/hints/key_validation_request_and_generator.d.ts +0 -30
  484. package/dest/kernel/hints/key_validation_request_and_generator.d.ts.map +0 -1
  485. package/dest/logs/directional_app_tagging_secret.d.ts +0 -40
  486. package/dest/logs/directional_app_tagging_secret.d.ts.map +0 -1
  487. package/dest/note/notes_filter.d.ts +0 -27
  488. package/dest/note/notes_filter.d.ts.map +0 -1
  489. package/dest/note/notes_filter.js +0 -11
  490. package/src/database-version/index.ts +0 -1
  491. package/src/note/notes_filter.ts +0 -38
@@ -0,0 +1,66 @@
1
+ /**
2
+ * Timetable constants used for sequencer timing calculations.
3
+ * These define the time budgets for various phases of block production.
4
+ *
5
+ * The sequencer slot is divided into phases:
6
+ * 1. Checkpoint initialization (sync + proposer check)
7
+ * 2. Block building (execution)
8
+ * 3. Checkpoint assembly
9
+ * 4. P2P propagation for proposal and attestations (round-trip)
10
+ * 5. L1 publishing
11
+ */
12
+
13
+ /** Time budget for checkpoint initialization (sync + proposer check) in seconds */
14
+ export const CHECKPOINT_INITIALIZATION_TIME = 1;
15
+
16
+ /** Time budget for assembling a checkpoint after building the last block in seconds */
17
+ export const CHECKPOINT_ASSEMBLE_TIME = 1;
18
+
19
+ /** Default one-way P2P propagation time for proposals and attestations in seconds */
20
+ export const DEFAULT_P2P_PROPAGATION_TIME = 2;
21
+
22
+ /** Default L1 publishing time (matches Ethereum slot duration on mainnet) in seconds */
23
+ export const DEFAULT_L1_PUBLISHING_TIME = 12;
24
+
25
+ /** Minimum execution time for building a block in seconds */
26
+ export const MIN_EXECUTION_TIME = 2;
27
+
28
+ /**
29
+ * Calculates the maximum number of blocks that can be built in a slot.
30
+ * Used by both the sequencer timetable and p2p gossipsub scoring.
31
+ *
32
+ * @param aztecSlotDurationSec - Aztec slot duration in seconds
33
+ * @param blockDurationSec - Duration per block in seconds (undefined = single block mode)
34
+ * @param opts - Optional overrides for timing constants
35
+ * @returns Maximum number of blocks per slot
36
+ */
37
+ export function calculateMaxBlocksPerSlot(
38
+ aztecSlotDurationSec: number,
39
+ blockDurationSec: number | undefined,
40
+ opts: {
41
+ checkpointInitializationTime?: number;
42
+ checkpointAssembleTime?: number;
43
+ p2pPropagationTime?: number;
44
+ l1PublishingTime?: number;
45
+ } = {},
46
+ ): number {
47
+ if (!blockDurationSec) {
48
+ return 1; // Single block per slot
49
+ }
50
+
51
+ const initOffset = opts.checkpointInitializationTime ?? CHECKPOINT_INITIALIZATION_TIME;
52
+ const assembleTime = opts.checkpointAssembleTime ?? CHECKPOINT_ASSEMBLE_TIME;
53
+ const p2pTime = opts.p2pPropagationTime ?? DEFAULT_P2P_PROPAGATION_TIME;
54
+ const l1Time = opts.l1PublishingTime ?? DEFAULT_L1_PUBLISHING_TIME;
55
+
56
+ // Calculate checkpoint finalization time (assembly + round-trip propagation + L1 publishing)
57
+ const checkpointFinalizationTime = assembleTime + p2pTime * 2 + l1Time;
58
+
59
+ // Time reserved at end for last sub-slot (validator re-execution) + finalization
60
+ const timeReservedAtEnd = blockDurationSec + checkpointFinalizationTime;
61
+
62
+ // Time available for building blocks
63
+ const timeAvailableForBlocks = aztecSlotDurationSec - initOffset - timeReservedAtEnd;
64
+
65
+ return Math.max(1, Math.floor(timeAvailableForBlocks / blockDurationSec));
66
+ }
@@ -1,4 +1,5 @@
1
1
  import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
2
+ import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
2
3
  import { Fr } from '@aztec/foundation/curves/bn254';
3
4
  import { schemas } from '@aztec/foundation/schemas';
4
5
  import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -81,11 +82,15 @@ export class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
81
82
  toHashInputs(): Buffer[] {
82
83
  return [
83
84
  ...this.leaf.toHashInputs(),
84
- Buffer.from(toBufferBE(this.nextIndex, 32)),
85
85
  Buffer.from(this.nextKey.toBuffer()),
86
+ Buffer.from(toBufferBE(this.nextIndex, 32)),
86
87
  ];
87
88
  }
88
89
 
90
+ hash(): Promise<Fr> {
91
+ return poseidon2Hash(this.toHashInputs());
92
+ }
93
+
89
94
  clone(): PublicDataTreeLeafPreimage {
90
95
  return new PublicDataTreeLeafPreimage(this.leaf.clone(), this.nextKey, this.nextIndex);
91
96
  }
@@ -104,10 +109,11 @@ export class PublicDataTreeLeafPreimage implements IndexedTreeLeafPreimage {
104
109
 
105
110
  static fromBuffer(buffer: Buffer | BufferReader): PublicDataTreeLeafPreimage {
106
111
  const reader = BufferReader.asReader(buffer);
107
- const value = PublicDataTreeLeaf.fromBuffer(reader);
108
- const nextIndex = toBigIntBE(reader.readBytes(32));
109
- const nextSlot = Fr.fromBuffer(reader);
110
- return new PublicDataTreeLeafPreimage(value, nextSlot, nextIndex);
112
+ return new PublicDataTreeLeafPreimage(
113
+ PublicDataTreeLeaf.fromBuffer(reader),
114
+ Fr.fromBuffer(reader),
115
+ toBigIntBE(reader.readBytes(32)),
116
+ );
111
117
  }
112
118
 
113
119
  static fromLeaf(leaf: PublicDataTreeLeaf, nextKey: bigint, nextIndex: bigint): PublicDataTreeLeafPreimage {
@@ -1,4 +1,4 @@
1
- import { BLOCK_HEADER_LENGTH, GeneratorIndex } from '@aztec/constants';
1
+ import { BLOCK_HEADER_LENGTH, DomainSeparator } from '@aztec/constants';
2
2
  import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
3
3
  import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
4
4
  import { randomInt } from '@aztec/foundation/crypto/random';
@@ -11,13 +11,14 @@ import type { FieldsOf } from '@aztec/foundation/types';
11
11
  import { inspect } from 'util';
12
12
  import { z } from 'zod';
13
13
 
14
+ import { BlockHash } from '../block/block_hash.js';
14
15
  import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
15
16
  import { GlobalVariables } from './global_variables.js';
16
17
  import { StateReference } from './state_reference.js';
17
18
 
18
19
  /** A header of an L2 block. */
19
20
  export class BlockHeader {
20
- private _cachedHash?: Promise<Fr>;
21
+ private _cachedHash?: Promise<BlockHash>;
21
22
 
22
23
  constructor(
23
24
  /** Snapshot of archive before the block is applied. */
@@ -161,16 +162,18 @@ export class BlockHeader {
161
162
  return BlockHeader.fromBuffer(hexToBuffer(str));
162
163
  }
163
164
 
164
- hash(): Promise<Fr> {
165
+ hash(): Promise<BlockHash> {
165
166
  if (!this._cachedHash) {
166
- this._cachedHash = poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.BLOCK_HASH);
167
+ this._cachedHash = poseidon2HashWithSeparator(this.toFields(), DomainSeparator.BLOCK_HEADER_HASH).then(
168
+ fr => new BlockHash(fr),
169
+ );
167
170
  }
168
171
  return this._cachedHash;
169
172
  }
170
173
 
171
174
  /** Manually set the hash for this block header if already computed */
172
175
  setHash(hashed: Fr) {
173
- this._cachedHash = Promise.resolve(hashed);
176
+ this._cachedHash = Promise.resolve(new BlockHash(hashed));
174
177
  }
175
178
 
176
179
  static random(overrides: Partial<FieldsOf<BlockHeader>> & Partial<FieldsOf<GlobalVariables>> = {}): BlockHeader {
@@ -22,10 +22,10 @@ import { schemas } from '../schemas/index.js';
22
22
  import type { UInt64 } from '../types/index.js';
23
23
 
24
24
  /**
25
- * Global variables that are constant across the entire slot.
26
- * TODO(palla/mbps): Should timestamp be included here as well?
25
+ * Global variables that are constant across the entire checkpoint (slot).
26
+ * Excludes blockNumber since that varies per block within a checkpoint.
27
27
  */
28
- export type CheckpointGlobalVariables = Omit<FieldsOf<GlobalVariables>, 'blockNumber' | 'timestamp'>;
28
+ export type CheckpointGlobalVariables = Omit<FieldsOf<GlobalVariables>, 'blockNumber'>;
29
29
 
30
30
  /**
31
31
  * Global variables of the L2 block.
@@ -1,8 +1,9 @@
1
1
  import { BlockNumber } from '@aztec/foundation/branded-types';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
3
  import { schemas } from '@aztec/foundation/schemas';
3
4
  import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
4
5
 
5
- import { L2BlockHash } from '../block/block_hash.js';
6
+ import { BlockHash } from '../block/block_hash.js';
6
7
  import { type DataInBlock, dataInBlockSchemaFor, randomDataInBlock } from '../block/in_block.js';
7
8
  import { TxEffect } from './tx_effect.js';
8
9
 
@@ -26,7 +27,7 @@ export function serializeIndexedTxEffect(effect: IndexedTxEffect): Buffer {
26
27
  export function deserializeIndexedTxEffect(buffer: Buffer): IndexedTxEffect {
27
28
  const reader = BufferReader.asReader(buffer);
28
29
 
29
- const l2BlockHash = reader.readObject(L2BlockHash);
30
+ const l2BlockHash = new BlockHash(reader.readObject(Fr));
30
31
  const l2BlockNumber = BlockNumber(reader.readNumber());
31
32
  const txIndexInBlock = reader.readNumber();
32
33
  const data = reader.readObject(TxEffect);
@@ -157,23 +157,23 @@ export class TxProfileResult {
157
157
  }
158
158
  }
159
159
 
160
- export class UtilitySimulationResult {
160
+ export class UtilityExecutionResult {
161
161
  constructor(
162
162
  public result: Fr[],
163
163
  public stats?: SimulationStats,
164
164
  ) {}
165
165
 
166
- static get schema(): ZodFor<UtilitySimulationResult> {
166
+ static get schema(): ZodFor<UtilityExecutionResult> {
167
167
  return z
168
168
  .object({
169
169
  result: z.array(schemas.Fr),
170
170
  stats: optional(SimulationStatsSchema),
171
171
  })
172
- .transform(({ result, stats }) => new UtilitySimulationResult(result, stats));
172
+ .transform(({ result, stats }) => new UtilityExecutionResult(result, stats));
173
173
  }
174
174
 
175
- static random(): UtilitySimulationResult {
176
- return new UtilitySimulationResult([Fr.random()], {
175
+ static random(): UtilityExecutionResult {
176
+ return new UtilityExecutionResult([Fr.random()], {
177
177
  nodeRPCCalls: {
178
178
  perMethod: { getBlockHeader: { times: [1] } },
179
179
  roundTrips: {
@@ -1,4 +1,4 @@
1
- import { GeneratorIndex, MAX_PROTOCOL_CONTRACTS } from '@aztec/constants';
1
+ import { DomainSeparator, MAX_PROTOCOL_CONTRACTS } from '@aztec/constants';
2
2
  import { makeTuple } from '@aztec/foundation/array';
3
3
  import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
4
4
  import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
@@ -71,7 +71,7 @@ export class ProtocolContracts {
71
71
  }
72
72
 
73
73
  hash() {
74
- return poseidon2HashWithSeparator(this.derivedAddresses, GeneratorIndex.PROTOCOL_CONTRACTS);
74
+ return poseidon2HashWithSeparator(this.derivedAddresses, DomainSeparator.PROTOCOL_CONTRACTS);
75
75
  }
76
76
 
77
77
  static get schema() {
@@ -7,6 +7,7 @@ import { z } from 'zod';
7
7
  import { SimulationError } from '../errors/simulation_error.js';
8
8
  import { Gas } from '../gas/gas.js';
9
9
  import type { GasUsed } from '../gas/gas_used.js';
10
+ import { DebugLog } from '../logs/debug_log.js';
10
11
  import { NullishToUndefined } from '../schemas/schemas.js';
11
12
  import { TxEffect } from '../tx/tx_effect.js';
12
13
  import { GlobalVariables } from './global_variables.js';
@@ -71,6 +72,7 @@ export class PublicSimulationOutput {
71
72
  public txEffect: TxEffect,
72
73
  public publicReturnValues: NestedProcessReturnValues[],
73
74
  public gasUsed: GasUsed,
75
+ public debugLogs: DebugLog[] = [],
74
76
  ) {}
75
77
 
76
78
  static get schema(): ZodFor<PublicSimulationOutput> {
@@ -86,6 +88,7 @@ export class PublicSimulationOutput {
86
88
  publicGas: Gas.schema,
87
89
  billedGas: Gas.schema,
88
90
  }),
91
+ debugLogs: z.array(DebugLog.schema).default([]),
89
92
  })
90
93
  .transform(
91
94
  fields =>
@@ -95,6 +98,7 @@ export class PublicSimulationOutput {
95
98
  fields.txEffect,
96
99
  fields.publicReturnValues,
97
100
  fields.gasUsed,
101
+ fields.debugLogs,
98
102
  ),
99
103
  );
100
104
  }
@@ -12,9 +12,11 @@ import { Gas } from '../gas/gas.js';
12
12
  import type { GasUsed } from '../gas/gas_used.js';
13
13
  import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
14
14
  import { ChonkProof } from '../proofs/chonk_proof.js';
15
+ import type { OffchainEffect } from './offchain_effect.js';
15
16
  import {
16
17
  PrivateCallExecutionResult,
17
18
  PrivateExecutionResult,
19
+ collectOffchainEffects,
18
20
  collectSortedContractClassLogs,
19
21
  } from './private_execution_result.js';
20
22
  import { type SimulationStats, SimulationStatsSchema } from './profiling.js';
@@ -84,6 +86,11 @@ export class TxSimulationResult {
84
86
  public stats?: SimulationStats,
85
87
  ) {}
86
88
 
89
+ /** Returns offchain effects collected from private execution. */
90
+ get offchainEffects(): OffchainEffect[] {
91
+ return collectOffchainEffects(this.privateExecutionResult);
92
+ }
93
+
87
94
  get gasUsed(): GasUsed {
88
95
  return (
89
96
  this.publicOutput?.gasUsed ?? {
@@ -106,7 +113,7 @@ export class TxSimulationResult {
106
113
  .transform(TxSimulationResult.from);
107
114
  }
108
115
 
109
- static from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed'>) {
116
+ static from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed' | 'offchainEffects'>) {
110
117
  return new TxSimulationResult(
111
118
  fields.privateExecutionResult,
112
119
  fields.publicInputs,
package/src/tx/tx.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import { Buffer32 } from '@aztec/foundation/buffer';
2
- import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
3
2
  import { Fr } from '@aztec/foundation/curves/bn254';
4
3
  import type { ZodFor } from '@aztec/foundation/schemas';
5
4
  import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
@@ -247,7 +246,7 @@ export class Tx extends Gossipable {
247
246
  contractClassLogSize: this.data.getEmittedContractClassLogsLength(),
248
247
 
249
248
  proofSize: this.chonkProof.fields.length,
250
- size: this.toBuffer().length,
249
+ size: this.getSize(),
251
250
 
252
251
  feePaymentMethod:
253
252
  // needsSetup? then we pay through a fee payment contract
@@ -255,13 +254,13 @@ export class Tx extends Gossipable {
255
254
  };
256
255
  }
257
256
 
258
- getSize() {
259
- return (
260
- this.data.getSize() +
261
- this.chonkProof.fields.length * Fr.SIZE_IN_BYTES +
262
- arraySerializedSizeOfNonEmpty(this.contractClassLogFields) +
263
- this.publicFunctionCalldata.reduce((accum, cd) => accum + cd.getSize(), 0)
264
- );
257
+ private sizeCache: number | undefined;
258
+
259
+ getSize(): number {
260
+ if (this.sizeCache == undefined) {
261
+ this.sizeCache = this.toBuffer().length;
262
+ }
263
+ return this.sizeCache;
265
264
  }
266
265
 
267
266
  /**
@@ -1,19 +1,35 @@
1
1
  import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
2
- import type { FieldsOf } from '@aztec/foundation/types';
3
2
 
4
3
  import { z } from 'zod';
5
4
 
6
5
  import { RevertCode } from '../avm/revert_code.js';
7
- import { L2BlockHash } from '../block/block_hash.js';
6
+ import { BlockHash } from '../block/block_hash.js';
7
+ import { DebugLog } from '../logs/debug_log.js';
8
8
  import { type ZodFor, schemas } from '../schemas/schemas.js';
9
9
  import { TxHash } from './tx_hash.js';
10
10
 
11
- /**
12
- * Possible status of a transaction.
13
- */
11
+ /** Block inclusion/finalization status. */
14
12
  export enum TxStatus {
15
13
  DROPPED = 'dropped',
16
14
  PENDING = 'pending',
15
+ PROPOSED = 'proposed',
16
+ CHECKPOINTED = 'checkpointed',
17
+ PROVEN = 'proven',
18
+ FINALIZED = 'finalized', // TODO(#13569): Implement finalized status properly
19
+ }
20
+
21
+ /** Tx status sorted by finalization progress. */
22
+ export const SortedTxStatuses: TxStatus[] = [
23
+ TxStatus.DROPPED,
24
+ TxStatus.PENDING,
25
+ TxStatus.PROPOSED,
26
+ TxStatus.CHECKPOINTED,
27
+ TxStatus.PROVEN,
28
+ TxStatus.FINALIZED,
29
+ ];
30
+
31
+ /** Execution result - only set when tx is in a block. */
32
+ export enum TxExecutionResult {
17
33
  SUCCESS = 'success',
18
34
  APP_LOGIC_REVERTED = 'app_logic_reverted',
19
35
  TEARDOWN_REVERTED = 'teardown_reverted',
@@ -30,20 +46,58 @@ export class TxReceipt {
30
46
  constructor(
31
47
  /** A unique identifier for a transaction. */
32
48
  public txHash: TxHash,
33
- /** The transaction's status. */
49
+ /** The transaction's block finalization status. */
34
50
  public status: TxStatus,
51
+ /** The execution result of the transaction, only set when tx is in a block. */
52
+ public executionResult: TxExecutionResult | undefined,
35
53
  /** Description of transaction error, if any. */
36
- public error: string,
54
+ public error: string | undefined,
37
55
  /** The transaction fee paid for the transaction. */
38
56
  public transactionFee?: bigint,
39
57
  /** The hash of the block containing the transaction. */
40
- public blockHash?: L2BlockHash,
58
+ public blockHash?: BlockHash,
41
59
  /** The block number in which the transaction was included. */
42
60
  public blockNumber?: BlockNumber,
61
+ /**
62
+ * Debug logs collected during public function execution. Served only when the node is in test mode and placed on
63
+ * the receipt only because it's a convenient place for it (the logs are printed out by the wallet when a mined
64
+ * tx receipt is obtained).
65
+ */
66
+ public debugLogs?: DebugLog[],
43
67
  ) {}
44
68
 
69
+ /** Returns true if the transaction was executed successfully. */
70
+ hasExecutionSucceeded(): boolean {
71
+ return this.executionResult === TxExecutionResult.SUCCESS;
72
+ }
73
+
74
+ /** Returns true if the transaction execution reverted. */
75
+ hasExecutionReverted(): boolean {
76
+ return this.executionResult !== undefined && this.executionResult !== TxExecutionResult.SUCCESS;
77
+ }
78
+
79
+ /** Returns true if the transaction has been included in a block (proposed, checkpointed, proven, or finalized). */
80
+ isMined(): boolean {
81
+ return (
82
+ this.status === TxStatus.PROPOSED ||
83
+ this.status === TxStatus.CHECKPOINTED ||
84
+ this.status === TxStatus.PROVEN ||
85
+ this.status === TxStatus.FINALIZED
86
+ );
87
+ }
88
+
89
+ /** Returns true if the transaction is pending. */
90
+ isPending(): boolean {
91
+ return this.status === TxStatus.PENDING;
92
+ }
93
+
94
+ /** Returns true if the transaction was dropped. */
95
+ isDropped(): boolean {
96
+ return this.status === TxStatus.DROPPED;
97
+ }
98
+
45
99
  static empty() {
46
- return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, '');
100
+ return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, undefined, undefined);
47
101
  }
48
102
 
49
103
  static get schema(): ZodFor<TxReceipt> {
@@ -51,34 +105,47 @@ export class TxReceipt {
51
105
  .object({
52
106
  txHash: TxHash.schema,
53
107
  status: z.nativeEnum(TxStatus),
54
- error: z.string(),
55
- blockHash: L2BlockHash.schema.optional(),
108
+ executionResult: z.nativeEnum(TxExecutionResult).optional(),
109
+ error: z.string().optional(),
110
+ blockHash: BlockHash.schema.optional(),
56
111
  blockNumber: BlockNumberSchema.optional(),
57
112
  transactionFee: schemas.BigInt.optional(),
113
+ debugLogs: z.array(DebugLog.schema).optional(),
58
114
  })
59
- .transform(TxReceipt.from);
115
+ .transform(fields => TxReceipt.from(fields));
60
116
  }
61
117
 
62
- static from(fields: FieldsOf<TxReceipt>) {
118
+ static from(fields: {
119
+ txHash: TxHash;
120
+ status: TxStatus;
121
+ executionResult?: TxExecutionResult;
122
+ error?: string;
123
+ transactionFee?: bigint;
124
+ blockHash?: BlockHash;
125
+ blockNumber?: BlockNumber;
126
+ debugLogs?: DebugLog[];
127
+ }) {
63
128
  return new TxReceipt(
64
129
  fields.txHash,
65
130
  fields.status,
131
+ fields.executionResult,
66
132
  fields.error,
67
133
  fields.transactionFee,
68
134
  fields.blockHash,
69
135
  fields.blockNumber,
136
+ fields.debugLogs,
70
137
  );
71
138
  }
72
139
 
73
- public static statusFromRevertCode(revertCode: RevertCode) {
140
+ public static executionResultFromRevertCode(revertCode: RevertCode): TxExecutionResult {
74
141
  if (revertCode.equals(RevertCode.OK)) {
75
- return TxStatus.SUCCESS;
142
+ return TxExecutionResult.SUCCESS;
76
143
  } else if (revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
77
- return TxStatus.APP_LOGIC_REVERTED;
144
+ return TxExecutionResult.APP_LOGIC_REVERTED;
78
145
  } else if (revertCode.equals(RevertCode.TEARDOWN_REVERTED)) {
79
- return TxStatus.TEARDOWN_REVERTED;
146
+ return TxExecutionResult.TEARDOWN_REVERTED;
80
147
  } else if (revertCode.equals(RevertCode.BOTH_REVERTED)) {
81
- return TxStatus.BOTH_REVERTED;
148
+ return TxExecutionResult.BOTH_REVERTED;
82
149
  } else {
83
150
  throw new Error(`Unknown revert code: ${revertCode.getCode()}`);
84
151
  }
@@ -1,4 +1,4 @@
1
- import { GeneratorIndex, TX_REQUEST_LENGTH } from '@aztec/constants';
1
+ import { DomainSeparator, TX_REQUEST_LENGTH } from '@aztec/constants';
2
2
  import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
3
3
  import { Fr } from '@aztec/foundation/curves/bn254';
4
4
  import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
@@ -68,7 +68,7 @@ export class TxRequest {
68
68
  }
69
69
 
70
70
  hash() {
71
- return poseidon2HashWithSeparator(this.toFields(), GeneratorIndex.TX_REQUEST);
71
+ return poseidon2HashWithSeparator(this.toFields(), DomainSeparator.TX_REQUEST);
72
72
  }
73
73
 
74
74
  static empty() {
@@ -1,6 +1,6 @@
1
1
  import type { AnyTx, TxValidationResult, TxValidator } from './tx_validator.js';
2
2
 
3
- export class EmptyTxValidator<T extends AnyTx = AnyTx> implements TxValidator<T> {
3
+ export class EmptyTxValidator<T = AnyTx> implements TxValidator<T> {
4
4
  public validateTx(_tx: T): Promise<TxValidationResult> {
5
5
  return Promise.resolve({ result: 'valid' });
6
6
  }
@@ -6,13 +6,14 @@ export const TX_ERROR_GAS_LIMIT_TOO_HIGH = 'Gas limit is higher than the amount
6
6
 
7
7
  // Phases
8
8
  export const TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED = 'Setup function not on allow list';
9
+ export const TX_ERROR_SETUP_FUNCTION_UNKNOWN_CONTRACT = 'Setup function targets unknown contract';
9
10
 
10
11
  // Nullifiers
11
12
  export const TX_ERROR_DUPLICATE_NULLIFIER_IN_TX = 'Duplicate nullifier in tx';
12
13
  export const TX_ERROR_EXISTING_NULLIFIER = 'Existing nullifier';
13
14
 
14
15
  // Metadata
15
- export const TX_ERROR_INVALID_INCLUDE_BY_TIMESTAMP = 'Invalid expiration timestamp';
16
+ export const TX_ERROR_INVALID_EXPIRATION_TIMESTAMP = 'Invalid expiration timestamp';
16
17
  export const TX_ERROR_INCORRECT_L1_CHAIN_ID = 'Incorrect L1 chain id';
17
18
  export const TX_ERROR_INCORRECT_ROLLUP_VERSION = 'Incorrect rollup version';
18
19
  export const TX_ERROR_INCORRECT_VK_TREE_ROOT = 'Incorrect verification keys tree root';
@@ -31,6 +32,9 @@ export const TX_ERROR_CONTRACT_CLASS_LOGS = 'Mismatched contract class logs';
31
32
  export const TX_ERROR_CONTRACT_CLASS_LOG_SORTING = 'Incorrectly sorted contract class logs';
32
33
  export const TX_ERROR_INCORRECT_HASH = 'Incorrect tx hash';
33
34
 
35
+ // Size
36
+ export const TX_ERROR_SIZE_ABOVE_LIMIT = 'Transaction size above size limit';
37
+
34
38
  // Block header
35
39
  export const TX_ERROR_BLOCK_HEADER = 'Block header not found';
36
40
 
@@ -20,7 +20,7 @@ export type TxValidationResult =
20
20
  | { result: 'invalid'; reason: string[] }
21
21
  | { result: 'skipped'; reason: string[] };
22
22
 
23
- export interface TxValidator<T extends AnyTx = AnyTx> {
23
+ export interface TxValidator<T = AnyTx> {
24
24
  validateTx(tx: T): Promise<TxValidationResult>;
25
25
  }
26
26
 
@@ -12,7 +12,14 @@ import type {
12
12
  } from './types.js';
13
13
 
14
14
  export const ValidatorStatusInSlotSchema = zodFor<ValidatorStatusInSlot>()(
15
- z.enum(['block-mined', 'block-proposed', 'block-missed', 'attestation-sent', 'attestation-missed']),
15
+ z.enum([
16
+ 'checkpoint-mined',
17
+ 'checkpoint-proposed',
18
+ 'checkpoint-missed',
19
+ 'blocks-missed',
20
+ 'attestation-sent',
21
+ 'attestation-missed',
22
+ ]),
16
23
  );
17
24
 
18
25
  export const ValidatorStatusHistorySchema = zodFor<ValidatorStatusHistory>()(
@@ -1,12 +1,13 @@
1
1
  import type { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
2
  import type { EthAddress } from '@aztec/foundation/eth-address';
3
3
 
4
- export type ValidatorStatusType = 'block' | 'attestation';
4
+ export type ValidatorStatusType = 'proposer' | 'attestation';
5
5
 
6
6
  export type ValidatorStatusInSlot =
7
- | 'block-mined'
8
- | 'block-proposed'
9
- | 'block-missed'
7
+ | 'checkpoint-mined'
8
+ | 'checkpoint-proposed'
9
+ | 'checkpoint-missed'
10
+ | 'blocks-missed'
10
11
  | 'attestation-sent'
11
12
  | 'attestation-missed';
12
13
 
@@ -1 +0,0 @@
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,EACL,WAAW,EACX,gBAAgB,EAEhB,qBAAqB,EAErB,UAAU,EACX,MAAM,iCAAiC,CAAC;AACzC,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,qBAAqB;IAVrD;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,qBAAqB,EACjD;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,qBAAgD,EAChD,WAAe,EACf,SAAc,EACd,aAAa,EACb,GAAG,oBAAoB,EACxB,GAAE;QACD,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;QAC9C,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,2 +0,0 @@
1
- export * from './version_manager.js';
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kYXRhYmFzZS12ZXJzaW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsc0JBQXNCLENBQUMifQ==
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/database-version/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}
@@ -1 +0,0 @@
1
- export * from './version_manager.js';
@@ -1,30 +0,0 @@
1
- import { Fr } from '@aztec/foundation/curves/bn254';
2
- import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
3
- import { KeyValidationRequest } from './key_validation_request.js';
4
- /**
5
- * Request for validating keys used in the app and a generator.
6
- */
7
- export declare class KeyValidationRequestAndGenerator {
8
- /** The key validation request. */
9
- readonly request: KeyValidationRequest;
10
- /**
11
- * The generator index which can be used along with sk_m to derive the sk_app stored in the request.
12
- * Note: This generator constrains that a correct key type gets validated in the kernel.
13
- */
14
- readonly skAppGenerator: Fr;
15
- constructor(
16
- /** The key validation request. */
17
- request: KeyValidationRequest,
18
- /**
19
- * The generator index which can be used along with sk_m to derive the sk_app stored in the request.
20
- * Note: This generator constrains that a correct key type gets validated in the kernel.
21
- */
22
- skAppGenerator: Fr);
23
- toBuffer(): Buffer<ArrayBufferLike>;
24
- static fromBuffer(buffer: Buffer | BufferReader): KeyValidationRequestAndGenerator;
25
- toFields(): Fr[];
26
- static fromFields(fields: Fr[] | FieldReader): KeyValidationRequestAndGenerator;
27
- isEmpty(): boolean;
28
- static empty(): KeyValidationRequestAndGenerator;
29
- }
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2V5X3ZhbGlkYXRpb25fcmVxdWVzdF9hbmRfZ2VuZXJhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsL2hpbnRzL2tleV92YWxpZGF0aW9uX3JlcXVlc3RfYW5kX2dlbmVyYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFM0YsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkU7O0dBRUc7QUFDSCxxQkFBYSxnQ0FBZ0M7SUFFekMsa0NBQWtDO2FBQ2xCLE9BQU8sRUFBRSxvQkFBb0I7SUFDN0M7OztPQUdHO2FBQ2EsY0FBYyxFQUFFLEVBQUU7SUFQcEM7SUFDRSxrQ0FBa0M7SUFDbEIsT0FBTyxFQUFFLG9CQUFvQjtJQUM3Qzs7O09BR0c7SUFDYSxjQUFjLEVBQUUsRUFBRSxFQUNoQztJQUVKLFFBQVEsNEJBRVA7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxvQ0FHOUM7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBUWY7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLEdBQUcsZ0NBQWdDLENBRzlFO0lBRUQsT0FBTyxZQUVOO0lBRUQsTUFBTSxDQUFDLEtBQUsscUNBRVg7Q0FDRiJ9
@@ -1 +0,0 @@
1
- {"version":3,"file":"key_validation_request_and_generator.d.ts","sourceRoot":"","sources":["../../../src/kernel/hints/key_validation_request_and_generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE;;GAEG;AACH,qBAAa,gCAAgC;IAEzC,kCAAkC;aAClB,OAAO,EAAE,oBAAoB;IAC7C;;;OAGG;aACa,cAAc,EAAE,EAAE;IAPpC;IACE,kCAAkC;IAClB,OAAO,EAAE,oBAAoB;IAC7C;;;OAGG;IACa,cAAc,EAAE,EAAE,EAChC;IAEJ,QAAQ,4BAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,oCAG9C;IAED,QAAQ,IAAI,EAAE,EAAE,CAQf;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,gCAAgC,CAG9E;IAED,OAAO,YAEN;IAED,MAAM,CAAC,KAAK,qCAEX;CACF"}