@aztec/pxe 0.0.1-commit.e558bd1c → 0.0.1-commit.e5a3663dd

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 (246) hide show
  1. package/dest/bin/check_oracle_version.js +4 -4
  2. package/dest/block_synchronizer/block_stream_source.d.ts +10 -0
  3. package/dest/block_synchronizer/block_stream_source.d.ts.map +1 -0
  4. package/dest/block_synchronizer/block_stream_source.js +37 -0
  5. package/dest/block_synchronizer/block_synchronizer.d.ts +6 -2
  6. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
  7. package/dest/block_synchronizer/block_synchronizer.js +30 -10
  8. package/dest/config/index.d.ts +2 -2
  9. package/dest/config/index.d.ts.map +1 -1
  10. package/dest/config/index.js +8 -15
  11. package/dest/config/package_info.js +1 -1
  12. package/dest/contract_function_simulator/contract_function_simulator.d.ts +62 -30
  13. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  14. package/dest/contract_function_simulator/contract_function_simulator.js +206 -76
  15. package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
  16. package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
  17. package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
  18. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
  19. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  20. package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
  21. package/dest/contract_function_simulator/index.d.ts +2 -1
  22. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  23. package/dest/contract_function_simulator/index.js +1 -0
  24. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +4 -6
  25. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  26. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +8 -10
  27. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
  28. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
  29. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
  30. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
  31. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
  32. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +4 -7
  33. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  34. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +6 -11
  35. package/dest/contract_function_simulator/oracle/interfaces.d.ts +63 -45
  36. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  37. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  38. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  39. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
  40. package/dest/contract_function_simulator/oracle/oracle.d.ts +76 -44
  41. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  42. package/dest/contract_function_simulator/oracle/oracle.js +289 -97
  43. package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
  44. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +58 -86
  45. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  46. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +121 -95
  47. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +124 -64
  48. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  49. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +356 -126
  50. package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
  51. package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
  52. package/dest/contract_function_simulator/pick_notes.js +20 -3
  53. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +1 -1
  54. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
  55. package/dest/contract_function_simulator/proxied_contract_data_source.js +3 -0
  56. package/dest/contract_logging.d.ts +27 -0
  57. package/dest/contract_logging.d.ts.map +1 -0
  58. package/dest/contract_logging.js +38 -0
  59. package/dest/contract_sync/contract_sync_service.d.ts +7 -4
  60. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
  61. package/dest/contract_sync/contract_sync_service.js +69 -35
  62. package/dest/contract_sync/helpers.d.ts +2 -2
  63. package/dest/contract_sync/helpers.d.ts.map +1 -1
  64. package/dest/contract_sync/helpers.js +9 -4
  65. package/dest/debug/pxe_debug_utils.d.ts +5 -6
  66. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  67. package/dest/debug/pxe_debug_utils.js +4 -7
  68. package/dest/entrypoints/client/bundle/index.d.ts +3 -1
  69. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  70. package/dest/entrypoints/client/bundle/index.js +2 -0
  71. package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
  72. package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
  73. package/dest/entrypoints/client/bundle/utils.js +11 -3
  74. package/dest/entrypoints/client/lazy/index.d.ts +3 -1
  75. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  76. package/dest/entrypoints/client/lazy/index.js +2 -0
  77. package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
  78. package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
  79. package/dest/entrypoints/client/lazy/utils.js +11 -3
  80. package/dest/entrypoints/pxe_creation_options.d.ts +3 -1
  81. package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
  82. package/dest/entrypoints/pxe_creation_options.js +3 -1
  83. package/dest/entrypoints/server/index.d.ts +3 -2
  84. package/dest/entrypoints/server/index.d.ts.map +1 -1
  85. package/dest/entrypoints/server/index.js +2 -1
  86. package/dest/entrypoints/server/utils.d.ts +2 -2
  87. package/dest/entrypoints/server/utils.d.ts.map +1 -1
  88. package/dest/entrypoints/server/utils.js +11 -3
  89. package/dest/events/event_service.d.ts +3 -2
  90. package/dest/events/event_service.d.ts.map +1 -1
  91. package/dest/events/event_service.js +26 -5
  92. package/dest/events/private_event_filter_validator.d.ts +3 -2
  93. package/dest/events/private_event_filter_validator.d.ts.map +1 -1
  94. package/dest/events/private_event_filter_validator.js +15 -0
  95. package/dest/logs/log_service.d.ts +7 -7
  96. package/dest/logs/log_service.d.ts.map +1 -1
  97. package/dest/logs/log_service.js +33 -48
  98. package/dest/messages/message_context_service.d.ts +17 -0
  99. package/dest/messages/message_context_service.d.ts.map +1 -0
  100. package/dest/messages/message_context_service.js +36 -0
  101. package/dest/notes/note_service.d.ts +4 -4
  102. package/dest/notes/note_service.d.ts.map +1 -1
  103. package/dest/notes/note_service.js +17 -7
  104. package/dest/notes_filter.d.ts +24 -0
  105. package/dest/notes_filter.d.ts.map +1 -0
  106. package/dest/notes_filter.js +4 -0
  107. package/dest/oracle_version.d.ts +4 -3
  108. package/dest/oracle_version.d.ts.map +1 -1
  109. package/dest/oracle_version.js +20 -10
  110. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
  111. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
  112. package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
  113. package/dest/private_kernel/hints/index.d.ts +1 -1
  114. package/dest/private_kernel/hints/index.js +1 -1
  115. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
  116. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
  117. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
  118. package/dest/private_kernel/hints/test_utils.d.ts +122 -0
  119. package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
  120. package/dest/private_kernel/hints/test_utils.js +203 -0
  121. package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
  122. package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
  123. package/dest/private_kernel/private_kernel_execution_prover.js +18 -13
  124. package/dest/private_kernel/private_kernel_oracle.d.ts +10 -6
  125. package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
  126. package/dest/private_kernel/private_kernel_oracle.js +19 -18
  127. package/dest/pxe.d.ts +84 -24
  128. package/dest/pxe.d.ts.map +1 -1
  129. package/dest/pxe.js +153 -83
  130. package/dest/storage/anchor_block_store/anchor_block_store.js +1 -1
  131. package/dest/storage/capsule_store/capsule_service.d.ts +21 -0
  132. package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
  133. package/dest/storage/capsule_store/capsule_service.js +50 -0
  134. package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
  135. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
  136. package/dest/storage/capsule_store/capsule_store.js +36 -28
  137. package/dest/storage/capsule_store/index.d.ts +2 -1
  138. package/dest/storage/capsule_store/index.d.ts.map +1 -1
  139. package/dest/storage/capsule_store/index.js +1 -0
  140. package/dest/storage/contract_store/contract_store.d.ts +42 -15
  141. package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
  142. package/dest/storage/contract_store/contract_store.js +148 -70
  143. package/dest/storage/metadata.d.ts +1 -1
  144. package/dest/storage/metadata.js +1 -1
  145. package/dest/storage/note_store/note_store.d.ts +3 -3
  146. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  147. package/dest/storage/note_store/note_store.js +3 -4
  148. package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
  149. package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
  150. package/dest/storage/private_event_store/private_event_store.js +3 -0
  151. package/dest/storage/private_event_store/stored_private_event.js +1 -1
  152. package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
  153. package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
  154. package/dest/storage/tagging_store/sender_tagging_store.d.ts +29 -28
  155. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  156. package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
  157. package/dest/tagging/get_all_logs_by_tags.d.ts +1 -1
  158. package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
  159. package/dest/tagging/get_all_logs_by_tags.js +17 -3
  160. package/dest/tagging/index.d.ts +3 -3
  161. package/dest/tagging/index.d.ts.map +1 -1
  162. package/dest/tagging/index.js +1 -1
  163. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +4 -5
  164. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
  165. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +8 -22
  166. package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
  167. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
  168. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
  169. package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
  170. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
  171. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  172. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
  173. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
  174. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
  175. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
  176. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -7
  177. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  178. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +36 -24
  179. package/package.json +16 -16
  180. package/src/bin/check_oracle_version.ts +4 -4
  181. package/src/block_synchronizer/block_stream_source.ts +52 -0
  182. package/src/block_synchronizer/block_synchronizer.ts +33 -11
  183. package/src/config/index.ts +3 -9
  184. package/src/config/package_info.ts +1 -1
  185. package/src/contract_function_simulator/contract_function_simulator.ts +366 -138
  186. package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
  187. package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
  188. package/src/contract_function_simulator/index.ts +1 -0
  189. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -9
  190. package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
  191. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
  192. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -10
  193. package/src/contract_function_simulator/oracle/interfaces.ts +91 -53
  194. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
  195. package/src/contract_function_simulator/oracle/oracle.ts +378 -140
  196. package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
  197. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +151 -183
  198. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +598 -156
  199. package/src/contract_function_simulator/pick_notes.ts +22 -3
  200. package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
  201. package/src/contract_logging.ts +52 -0
  202. package/src/contract_sync/contract_sync_service.ts +102 -55
  203. package/src/contract_sync/helpers.ts +8 -3
  204. package/src/debug/pxe_debug_utils.ts +11 -14
  205. package/src/entrypoints/client/bundle/index.ts +2 -0
  206. package/src/entrypoints/client/bundle/utils.ts +11 -4
  207. package/src/entrypoints/client/lazy/index.ts +2 -0
  208. package/src/entrypoints/client/lazy/utils.ts +11 -4
  209. package/src/entrypoints/pxe_creation_options.ts +7 -0
  210. package/src/entrypoints/server/index.ts +2 -1
  211. package/src/entrypoints/server/utils.ts +9 -10
  212. package/src/events/event_service.ts +30 -5
  213. package/src/events/private_event_filter_validator.ts +21 -1
  214. package/src/logs/log_service.ts +63 -91
  215. package/src/messages/message_context_service.ts +44 -0
  216. package/src/notes/note_service.ts +19 -8
  217. package/src/notes_filter.ts +24 -0
  218. package/src/oracle_version.ts +20 -10
  219. package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
  220. package/src/private_kernel/hints/index.ts +1 -1
  221. package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
  222. package/src/private_kernel/hints/test_utils.ts +325 -0
  223. package/src/private_kernel/private_kernel_execution_prover.ts +18 -16
  224. package/src/private_kernel/private_kernel_oracle.ts +21 -21
  225. package/src/pxe.ts +278 -131
  226. package/src/storage/anchor_block_store/anchor_block_store.ts +1 -1
  227. package/src/storage/capsule_store/capsule_service.ts +90 -0
  228. package/src/storage/capsule_store/capsule_store.ts +44 -26
  229. package/src/storage/capsule_store/index.ts +1 -0
  230. package/src/storage/contract_store/contract_store.ts +181 -80
  231. package/src/storage/metadata.ts +1 -1
  232. package/src/storage/note_store/note_store.ts +5 -5
  233. package/src/storage/private_event_store/private_event_store.ts +4 -0
  234. package/src/storage/private_event_store/stored_private_event.ts +1 -1
  235. package/src/storage/tagging_store/recipient_tagging_store.ts +9 -5
  236. package/src/storage/tagging_store/sender_tagging_store.ts +185 -138
  237. package/src/tagging/get_all_logs_by_tags.ts +28 -4
  238. package/src/tagging/index.ts +2 -2
  239. package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +12 -25
  240. package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
  241. package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
  242. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +23 -10
  243. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
  244. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +27 -26
  245. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
  246. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
@@ -1,6 +1,7 @@
1
1
  import type { FUNCTION_TREE_HEIGHT } from '@aztec/constants';
2
- import type { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
3
3
  import { toArray } from '@aztec/foundation/iterable';
4
+ import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
4
5
  import type { MembershipWitness } from '@aztec/foundation/trees';
5
6
  import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
6
7
  import {
@@ -19,7 +20,8 @@ import {
19
20
  } from '@aztec/stdlib/abi';
20
21
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
21
22
  import {
22
- type ContractClass,
23
+ type ContractClassIdPreimage,
24
+ type ContractClassWithId,
23
25
  type ContractInstanceWithAddress,
24
26
  SerializableContractInstance,
25
27
  getContractClassFromArtifact,
@@ -27,6 +29,68 @@ import {
27
29
 
28
30
  import { PrivateFunctionsTree } from './private_functions_tree.js';
29
31
 
32
+ const VERSION = 1 as const;
33
+
34
+ /**
35
+ * All contract class data except the large packedBytecode.
36
+ * The expensive data from the ContractClass is precomputed and stored in this format to avoid redundant hashing.
37
+ * Since we have to store the artifacts anyway, the final ContractClass is reconstructed by combining this data
38
+ * with the packedBytecode obtained from the former. That way we can have quick class lookups without wasted storage.
39
+ */
40
+ export class SerializableContractClassData {
41
+ public readonly version = VERSION;
42
+ public readonly id: Fr;
43
+ public readonly artifactHash: Fr;
44
+ public readonly privateFunctionsRoot: Fr;
45
+ public readonly publicBytecodeCommitment: Fr;
46
+ public readonly privateFunctions: { selector: FunctionSelector; vkHash: Fr }[];
47
+
48
+ constructor(
49
+ data: ContractClassIdPreimage & {
50
+ id: Fr;
51
+ privateFunctions: { selector: FunctionSelector; vkHash: Fr }[];
52
+ },
53
+ ) {
54
+ this.id = data.id;
55
+ this.artifactHash = data.artifactHash;
56
+ this.privateFunctionsRoot = data.privateFunctionsRoot;
57
+ this.publicBytecodeCommitment = data.publicBytecodeCommitment;
58
+ this.privateFunctions = data.privateFunctions;
59
+ }
60
+
61
+ toBuffer(): Buffer {
62
+ return serializeToBuffer(
63
+ numToUInt8(this.version),
64
+ this.id,
65
+ this.artifactHash,
66
+ this.privateFunctionsRoot,
67
+ this.publicBytecodeCommitment,
68
+ this.privateFunctions.length,
69
+ ...this.privateFunctions.map(fn => serializeToBuffer(fn.selector, fn.vkHash)),
70
+ );
71
+ }
72
+
73
+ static fromBuffer(bufferOrReader: Buffer | BufferReader): SerializableContractClassData {
74
+ const reader = BufferReader.asReader(bufferOrReader);
75
+ const version = reader.readUInt8();
76
+ if (version !== VERSION) {
77
+ throw new Error(`Unexpected contract class data version ${version}`);
78
+ }
79
+ return new SerializableContractClassData({
80
+ id: reader.readObject(Fr),
81
+ artifactHash: reader.readObject(Fr),
82
+ privateFunctionsRoot: reader.readObject(Fr),
83
+ publicBytecodeCommitment: reader.readObject(Fr),
84
+ privateFunctions: reader.readVector({
85
+ fromBuffer: (r: BufferReader) => ({
86
+ selector: r.readObject(FunctionSelector),
87
+ vkHash: r.readObject(Fr),
88
+ }),
89
+ }),
90
+ });
91
+ }
92
+ }
93
+
30
94
  /**
31
95
  * ContractStore serves as a data manager and retriever for Aztec.nr contracts.
32
96
  * It provides methods to obtain contract addresses, function ABI, bytecode, and membership witnesses
@@ -39,76 +103,95 @@ export class ContractStore {
39
103
  // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
40
104
  #privateFunctionTrees: Map<string, PrivateFunctionsTree> = new Map();
41
105
 
42
- /** Map from contract address to contract class id */
106
+ /**
107
+ * In-memory cache of deserialized ContractArtifact objects, keyed by class id string.
108
+ * Avoids repeated LMDB reads + JSON.parse + Zod validation on every oracle call.
109
+ * Artifacts are large but immutable after registration — safe to cache for the lifetime of the store.
110
+ */
111
+ // TODO: Update it to be LRU cache so that it doesn't keep all the data all the time.
112
+ #contractArtifactCache: Map<string, ContractArtifact> = new Map();
113
+
114
+ /** Map from contract address to contract class id (avoids KV round-trip on hot path). */
43
115
  #contractClassIdMap: Map<string, Fr> = new Map();
44
116
 
45
117
  #store: AztecAsyncKVStore;
46
118
  #contractArtifacts: AztecAsyncMap<string, Buffer>;
119
+ #contractClassData: AztecAsyncMap<string, Buffer>;
47
120
  #contractInstances: AztecAsyncMap<string, Buffer>;
48
121
 
49
122
  constructor(store: AztecAsyncKVStore) {
50
123
  this.#store = store;
51
124
  this.#contractArtifacts = store.openMap('contract_artifacts');
125
+ this.#contractClassData = store.openMap('contract_classes');
52
126
  this.#contractInstances = store.openMap('contracts_instances');
53
127
  }
54
128
 
55
129
  // Setters
56
130
 
57
- public async addContractArtifact(id: Fr, contract: ContractArtifact): Promise<void> {
58
- // Validation outside transactionAsync - these are not DB operations
131
+ /**
132
+ * Registers a new contract artifact and its corresponding class data.
133
+ * IMPORTANT: This method does not verify that the provided artifact matches the class data or that the class id matches the artifact.
134
+ * It is the caller's responsibility to ensure the consistency and correctness of the provided data.
135
+ * This is done to avoid redundant, expensive contract class computations
136
+ */
137
+ public async addContractArtifact(
138
+ contract: ContractArtifact,
139
+ contractClassWithIdAndPreimage?: ContractClassWithId & ContractClassIdPreimage,
140
+ ): Promise<Fr> {
141
+ const contractClass = contractClassWithIdAndPreimage ?? (await getContractClassFromArtifact(contract));
142
+ const key = contractClass.id.toString();
143
+
144
+ if (this.#contractArtifactCache.has(key)) {
145
+ return contractClass.id;
146
+ }
147
+
59
148
  const privateFunctions = contract.functions.filter(
60
149
  functionArtifact => functionArtifact.functionType === FunctionType.PRIVATE,
61
150
  );
62
-
63
151
  const privateSelectors = await Promise.all(
64
- privateFunctions.map(async privateFunctionArtifact =>
65
- (
66
- await FunctionSelector.fromNameAndParameters(privateFunctionArtifact.name, privateFunctionArtifact.parameters)
67
- ).toString(),
152
+ privateFunctions.map(async fn =>
153
+ (await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)).toString(),
68
154
  ),
69
155
  );
70
-
71
156
  if (privateSelectors.length !== new Set(privateSelectors).size) {
72
157
  throw new Error('Repeated function selectors of private functions');
73
158
  }
74
159
 
75
- await this.#store.transactionAsync(() =>
76
- this.#contractArtifacts.set(id.toString(), contractArtifactToBuffer(contract)),
77
- );
160
+ this.#contractArtifactCache.set(key, contract);
161
+
162
+ await this.#store.transactionAsync(async () => {
163
+ await this.#contractArtifacts.set(key, contractArtifactToBuffer(contract));
164
+ await this.#contractClassData.set(key, new SerializableContractClassData(contractClass).toBuffer());
165
+ });
166
+
167
+ return contractClass.id;
78
168
  }
79
169
 
80
170
  async addContractInstance(contract: ContractInstanceWithAddress): Promise<void> {
81
- this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
171
+ await this.#store.transactionAsync(async () => {
172
+ await this.#contractInstances.set(
173
+ contract.address.toString(),
174
+ new SerializableContractInstance(contract).toBuffer(),
175
+ );
176
+ });
82
177
 
83
- await this.#contractInstances.set(
84
- contract.address.toString(),
85
- new SerializableContractInstance(contract).toBuffer(),
86
- );
178
+ this.#contractClassIdMap.set(contract.address.toString(), contract.currentContractClassId);
87
179
  }
88
180
 
89
181
  // Private getters
90
182
 
91
183
  async #getContractClassId(contractAddress: AztecAddress): Promise<Fr | undefined> {
92
- if (!this.#contractClassIdMap.has(contractAddress.toString())) {
184
+ const key = contractAddress.toString();
185
+ if (!this.#contractClassIdMap.has(key)) {
93
186
  const instance = await this.getContractInstance(contractAddress);
94
187
  if (!instance) {
95
188
  return;
96
189
  }
97
- this.#contractClassIdMap.set(contractAddress.toString(), instance.currentContractClassId);
190
+ this.#contractClassIdMap.set(key, instance.currentContractClassId);
98
191
  }
99
- return this.#contractClassIdMap.get(contractAddress.toString());
192
+ return this.#contractClassIdMap.get(key);
100
193
  }
101
194
 
102
- /**
103
- * Retrieve or create a ContractTree instance based on the provided class id.
104
- * If an existing tree with the same class id is found in the cache, it will be returned.
105
- * Otherwise, a new ContractTree instance will be created using the contract data from the database
106
- * and added to the cache before returning.
107
- *
108
- * @param classId - The class id of the contract for which the ContractTree is required.
109
- * @returns A ContractTree instance associated with the specified contract address.
110
- * @throws An Error if the contract is not found in the ContractDatabase.
111
- */
112
195
  async #getPrivateFunctionTreeForClassId(classId: Fr): Promise<PrivateFunctionsTree | undefined> {
113
196
  if (!this.#privateFunctionTrees.has(classId.toString())) {
114
197
  const artifact = await this.getContractArtifact(classId);
@@ -121,9 +204,9 @@ export class ContractStore {
121
204
  return this.#privateFunctionTrees.get(classId.toString())!;
122
205
  }
123
206
 
124
- async #getContractArtifactByAddress(contractAddress: AztecAddress): Promise<ContractArtifact | undefined> {
125
- const contractClassId = await this.#getContractClassId(contractAddress);
126
- return contractClassId && this.getContractArtifact(contractClassId);
207
+ async #getArtifactByAddress(contractAddress: AztecAddress): Promise<ContractArtifact | undefined> {
208
+ const classId = await this.#getContractClassId(contractAddress);
209
+ return classId && this.getContractArtifact(classId);
127
210
  }
128
211
 
129
212
  // Public getters
@@ -135,7 +218,7 @@ export class ContractStore {
135
218
  });
136
219
  }
137
220
 
138
- /** Returns a contract instance for a given address. Throws if not found. */
221
+ /** Returns a contract instance for a given address. */
139
222
  public getContractInstance(contractAddress: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
140
223
  return this.#store.transactionAsync(async () => {
141
224
  const contract = await this.#contractInstances.getAsync(contractAddress.toString());
@@ -143,18 +226,39 @@ export class ContractStore {
143
226
  });
144
227
  }
145
228
 
146
- public getContractArtifact(contractClassId: Fr): Promise<ContractArtifact | undefined> {
147
- return this.#store.transactionAsync(async () => {
148
- const contract = await this.#contractArtifacts.getAsync(contractClassId.toString());
149
- // TODO(@spalladino): AztecAsyncMap lies and returns Uint8Arrays instead of Buffers, hence the extra Buffer.from.
150
- return contract && contractArtifactFromBuffer(Buffer.from(contract));
229
+ /** Returns the raw contract artifact for a given class id. */
230
+ public async getContractArtifact(contractClassId: Fr): Promise<ContractArtifact | undefined> {
231
+ const key = contractClassId.toString();
232
+ const cached = this.#contractArtifactCache.get(key);
233
+ if (cached) {
234
+ return cached;
235
+ }
236
+ const artifact = await this.#store.transactionAsync(async () => {
237
+ const buf = await this.#contractArtifacts.getAsync(key);
238
+ return buf && contractArtifactFromBuffer(buf);
151
239
  });
240
+ if (artifact) {
241
+ this.#contractArtifactCache.set(key, artifact);
242
+ }
243
+ return artifact;
152
244
  }
153
245
 
154
- /** Returns a contract class for a given class id. Throws if not found. */
155
- public async getContractClass(contractClassId: Fr): Promise<ContractClass | undefined> {
246
+ /** Returns a contract class for a given class id. */
247
+ public async getContractClassWithPreimage(
248
+ contractClassId: Fr,
249
+ ): Promise<(ContractClassWithId & ContractClassIdPreimage) | undefined> {
250
+ const key = contractClassId.toString();
251
+ const buf = await this.#store.transactionAsync(() => this.#contractClassData.getAsync(key));
252
+ if (!buf) {
253
+ return undefined;
254
+ }
255
+ const classData = SerializableContractClassData.fromBuffer(buf);
156
256
  const artifact = await this.getContractArtifact(contractClassId);
157
- return artifact && getContractClassFromArtifact(artifact);
257
+ if (!artifact) {
258
+ return undefined;
259
+ }
260
+ const packedBytecode = artifact.functions.find(f => f.name === 'public_dispatch')?.bytecode ?? Buffer.alloc(0);
261
+ return { ...classData, packedBytecode };
158
262
  }
159
263
 
160
264
  public async getContract(
@@ -173,8 +277,6 @@ export class ContractStore {
173
277
 
174
278
  /**
175
279
  * Retrieves the artifact of a specified function within a given contract.
176
- * The function is identified by its selector, which is a unique code generated from the function's signature.
177
- * Throws an error if the contract address or function selector are invalid or not found.
178
280
  *
179
281
  * @param contractAddress - The AztecAddress representing the contract containing the function.
180
282
  * @param selector - The function selector.
@@ -184,9 +286,12 @@ export class ContractStore {
184
286
  contractAddress: AztecAddress,
185
287
  selector: FunctionSelector,
186
288
  ): Promise<FunctionArtifactWithContractName | undefined> {
187
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
188
- const fnArtifact = artifact && (await this.#findFunctionArtifactBySelector(artifact, selector));
189
- return fnArtifact && { ...fnArtifact, contractName: artifact.name };
289
+ const artifact = await this.#getArtifactByAddress(contractAddress);
290
+ if (!artifact) {
291
+ return undefined;
292
+ }
293
+ const fn = await this.#findFunctionArtifactBySelector(artifact, selector);
294
+ return fn && { ...fn, contractName: artifact.name };
190
295
  }
191
296
 
192
297
  public async getFunctionArtifactWithDebugMetadata(
@@ -207,50 +312,48 @@ export class ContractStore {
207
312
  public async getPublicFunctionArtifact(
208
313
  contractAddress: AztecAddress,
209
314
  ): Promise<FunctionArtifactWithContractName | undefined> {
210
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
211
- const fnArtifact = artifact && artifact.functions.find(fn => fn.functionType === FunctionType.PUBLIC);
212
- return fnArtifact && { ...fnArtifact, contractName: artifact.name };
315
+ const artifact = await this.#getArtifactByAddress(contractAddress);
316
+ const fn = artifact && artifact.functions.find(f => f.functionType === FunctionType.PUBLIC);
317
+ return fn && { ...fn, contractName: artifact.name };
213
318
  }
214
319
 
215
320
  public async getFunctionAbi(
216
321
  contractAddress: AztecAddress,
217
322
  selector: FunctionSelector,
218
323
  ): Promise<FunctionAbi | undefined> {
219
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
324
+ const artifact = await this.#getArtifactByAddress(contractAddress);
220
325
  return artifact && (await this.#findFunctionAbiBySelector(artifact, selector));
221
326
  }
222
327
 
223
328
  /**
224
329
  * Retrieves the debug metadata of a specified function within a given contract.
225
- * The function is identified by its selector, which is a unique code generated from the function's signature.
226
- * Returns undefined if the debug metadata for the given function is not found.
227
- * Throws if the contract has not been added to the database.
228
330
  *
229
331
  * @param contractAddress - The AztecAddress representing the contract containing the function.
230
332
  * @param selector - The function selector.
231
- * @returns The corresponding function's artifact as an object.
333
+ * @returns The corresponding function's debug metadata, or undefined.
232
334
  */
233
335
  public async getFunctionDebugMetadata(
234
336
  contractAddress: AztecAddress,
235
337
  selector: FunctionSelector,
236
338
  ): Promise<FunctionDebugMetadata | undefined> {
237
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
238
- const fnArtifact = artifact && (await this.#findFunctionArtifactBySelector(artifact, selector));
239
- return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
339
+ const artifact = await this.#getArtifactByAddress(contractAddress);
340
+ if (!artifact) {
341
+ return undefined;
342
+ }
343
+ const fn = await this.#findFunctionArtifactBySelector(artifact, selector);
344
+ return fn && getFunctionDebugMetadata(artifact, fn);
240
345
  }
241
346
 
242
347
  public async getPublicFunctionDebugMetadata(
243
348
  contractAddress: AztecAddress,
244
349
  ): Promise<FunctionDebugMetadata | undefined> {
245
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
246
- const fnArtifact = artifact && artifact.functions.find(fn => fn.functionType === FunctionType.PUBLIC);
247
- return fnArtifact && getFunctionDebugMetadata(artifact, fnArtifact);
350
+ const artifact = await this.#getArtifactByAddress(contractAddress);
351
+ const fn = artifact && artifact.functions.find(f => f.functionType === FunctionType.PUBLIC);
352
+ return fn && getFunctionDebugMetadata(artifact, fn);
248
353
  }
249
354
 
250
355
  /**
251
356
  * Retrieve the function membership witness for the given contract class and function selector.
252
- * The function membership witness represents a proof that the function belongs to the specified contract.
253
- * Throws an error if the contract address or function selector is unknown.
254
357
  *
255
358
  * @param contractClassId - The id of the class.
256
359
  * @param selector - The function selector.
@@ -265,23 +368,21 @@ export class ContractStore {
265
368
  }
266
369
 
267
370
  public async getDebugContractName(contractAddress: AztecAddress) {
268
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
371
+ const artifact = await this.#getArtifactByAddress(contractAddress);
269
372
  return artifact?.name;
270
373
  }
271
374
 
272
375
  public async getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector) {
273
- const artifact = await this.#getContractArtifactByAddress(contractAddress);
274
- const fnArtifact = artifact && (await this.#findFunctionAbiBySelector(artifact, selector));
275
- return `${artifact?.name ?? contractAddress}:${fnArtifact?.name ?? selector}`;
376
+ const artifact = await this.#getArtifactByAddress(contractAddress);
377
+ const fn = artifact && (await this.#findFunctionAbiBySelector(artifact, selector));
378
+ return `${artifact?.name ?? contractAddress}:${fn?.name ?? selector}`;
276
379
  }
277
380
 
278
381
  async #findFunctionArtifactBySelector(
279
382
  artifact: ContractArtifact,
280
383
  selector: FunctionSelector,
281
384
  ): Promise<FunctionArtifact | undefined> {
282
- const functions = artifact.functions;
283
- for (let i = 0; i < functions.length; i++) {
284
- const fn = functions[i];
385
+ for (const fn of artifact.functions) {
285
386
  const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
286
387
  if (fnSelector.equals(selector)) {
287
388
  return fn;
@@ -293,9 +394,7 @@ export class ContractStore {
293
394
  artifact: ContractArtifact,
294
395
  selector: FunctionSelector,
295
396
  ): Promise<FunctionAbi | undefined> {
296
- const functions = [...artifact.functions, ...(artifact.nonDispatchPublicFunctions ?? [])];
297
- for (let i = 0; i < functions.length; i++) {
298
- const fn = functions[i];
397
+ for (const fn of [...artifact.functions, ...(artifact.nonDispatchPublicFunctions ?? [])]) {
299
398
  const fnSelector = await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters);
300
399
  if (fnSelector.equals(selector)) {
301
400
  return fn;
@@ -316,15 +415,17 @@ export class ContractStore {
316
415
  throw new Error(`Unknown function ${functionName} in contract ${contract.name}.`);
317
416
  }
318
417
 
319
- return {
418
+ const selector = await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters);
419
+
420
+ return FunctionCall.from({
320
421
  name: functionDao.name,
321
- args: encodeArguments(functionDao, args),
322
- selector: await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters),
323
- type: functionDao.functionType,
324
422
  to,
423
+ selector,
424
+ type: functionDao.functionType,
325
425
  hideMsgSender: false,
326
426
  isStatic: functionDao.isStatic,
427
+ args: encodeArguments(functionDao, args),
327
428
  returnTypes: functionDao.returnTypes,
328
- };
429
+ });
329
430
  }
330
431
  }
@@ -1 +1 @@
1
- export const PXE_DATA_SCHEMA_VERSION = 3;
1
+ export const PXE_DATA_SCHEMA_VERSION = 5;
@@ -3,9 +3,10 @@ import type { Fr } from '@aztec/foundation/schemas';
3
3
  import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
4
4
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
5
5
  import type { DataInBlock } from '@aztec/stdlib/block';
6
- import { NoteDao, NoteStatus, type NotesFilter } from '@aztec/stdlib/note';
6
+ import { NoteDao, NoteStatus } from '@aztec/stdlib/note';
7
7
 
8
8
  import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
9
+ import type { NotesFilter } from '../../notes_filter.js';
9
10
  import { StoredNote } from './stored_note.js';
10
11
 
11
12
  /**
@@ -103,11 +104,10 @@ export class NoteStore implements StagedStore {
103
104
  * @params jobId - the job context to read from.
104
105
  * @returns Filtered and deduplicated notes (a note might be present in multiple scopes - we ensure it is only
105
106
  * returned once if this is the case)
106
- * @throws If filtering by an empty scopes array. Scopes have to be set to undefined or to a non-empty array.
107
107
  */
108
108
  getNotes(filter: NotesFilter, jobId: string): Promise<NoteDao[]> {
109
- if (filter.scopes !== undefined && filter.scopes.length === 0) {
110
- return Promise.reject(new Error('Trying to get notes with an empty scopes array'));
109
+ if (filter.scopes.length === 0) {
110
+ return Promise.resolve([]);
111
111
  }
112
112
 
113
113
  return this.#store.transactionAsync(async () => {
@@ -180,7 +180,7 @@ export class NoteStore implements StagedStore {
180
180
  continue;
181
181
  }
182
182
 
183
- if (filter.scopes && note.scopes.intersection(new Set(filter.scopes.map(s => s.toString()))).size === 0) {
183
+ if (note.scopes.intersection(new Set(filter.scopes.map(s => s.toString()))).size === 0) {
184
184
  continue;
185
185
  }
186
186
 
@@ -234,6 +234,10 @@ export class PrivateEventStore implements StagedStore {
234
234
  * IMPORTANT: This method must be called within a transaction to ensure atomicity.
235
235
  */
236
236
  public async rollback(blockNumber: number, synchedBlockNumber: number): Promise<void> {
237
+ if (this.#eventsForJob.size > 0) {
238
+ throw new Error('PXE private event store rollback is not allowed while jobs are running');
239
+ }
240
+
237
241
  // First pass: collect all event IDs for all blocks, starting reads during iteration to keep tx alive.
238
242
  const eventsByBlock: Map<number, { eventId: string; eventReadPromise: Promise<Buffer | undefined> }[]> = new Map();
239
243
 
@@ -49,7 +49,7 @@ export class StoredPrivateEvent {
49
49
  const msgContentLength = reader.readNumber();
50
50
  const msgContent = reader.readArray(msgContentLength, Fr);
51
51
  const l2BlockNumber = reader.readNumber();
52
- const l2BlockHash = new BlockHash(Fr.fromBuffer(reader));
52
+ const l2BlockHash = BlockHash.fromBuffer(reader);
53
53
  const txHash = TxHash.fromBuffer(reader);
54
54
  const txIndexInBlock = reader.readNumber();
55
55
  const eventIndexInTx = reader.readNumber();
@@ -1,5 +1,5 @@
1
1
  import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
2
- import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
2
+ import type { ExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
3
3
 
4
4
  import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
5
5
 
@@ -106,11 +106,11 @@ export class RecipientTaggingStore implements StagedStore {
106
106
  return Promise.resolve();
107
107
  }
108
108
 
109
- getHighestAgedIndex(secret: DirectionalAppTaggingSecret, jobId: string): Promise<number | undefined> {
109
+ getHighestAgedIndex(secret: ExtendedDirectionalAppTaggingSecret, jobId: string): Promise<number | undefined> {
110
110
  return this.#store.transactionAsync(() => this.#readHighestAgedIndex(jobId, secret.toString()));
111
111
  }
112
112
 
113
- updateHighestAgedIndex(secret: DirectionalAppTaggingSecret, index: number, jobId: string): Promise<void> {
113
+ updateHighestAgedIndex(secret: ExtendedDirectionalAppTaggingSecret, index: number, jobId: string): Promise<void> {
114
114
  return this.#store.transactionAsync(async () => {
115
115
  const currentIndex = await this.#readHighestAgedIndex(jobId, secret.toString());
116
116
  if (currentIndex !== undefined && index <= currentIndex) {
@@ -121,11 +121,15 @@ export class RecipientTaggingStore implements StagedStore {
121
121
  });
122
122
  }
123
123
 
124
- getHighestFinalizedIndex(secret: DirectionalAppTaggingSecret, jobId: string): Promise<number | undefined> {
124
+ getHighestFinalizedIndex(secret: ExtendedDirectionalAppTaggingSecret, jobId: string): Promise<number | undefined> {
125
125
  return this.#store.transactionAsync(() => this.#readHighestFinalizedIndex(jobId, secret.toString()));
126
126
  }
127
127
 
128
- updateHighestFinalizedIndex(secret: DirectionalAppTaggingSecret, index: number, jobId: string): Promise<void> {
128
+ updateHighestFinalizedIndex(
129
+ secret: ExtendedDirectionalAppTaggingSecret,
130
+ index: number,
131
+ jobId: string,
132
+ ): Promise<void> {
129
133
  return this.#store.transactionAsync(async () => {
130
134
  const currentIndex = await this.#readHighestFinalizedIndex(jobId, secret.toString());
131
135
  if (currentIndex !== undefined && index < currentIndex) {