@aztec/pxe 0.0.1-commit.c2595eba → 0.0.1-commit.c2eed6949

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 (224) hide show
  1. package/dest/access_scopes.d.ts +9 -0
  2. package/dest/access_scopes.d.ts.map +1 -0
  3. package/dest/access_scopes.js +6 -0
  4. package/dest/block_synchronizer/block_synchronizer.d.ts +4 -2
  5. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
  6. package/dest/block_synchronizer/block_synchronizer.js +7 -1
  7. package/dest/config/index.d.ts +2 -2
  8. package/dest/config/index.d.ts.map +1 -1
  9. package/dest/config/index.js +1 -1
  10. package/dest/config/package_info.js +1 -1
  11. package/dest/contract_function_simulator/contract_function_simulator.d.ts +61 -31
  12. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  13. package/dest/contract_function_simulator/contract_function_simulator.js +200 -74
  14. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
  15. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  16. package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
  17. package/dest/contract_function_simulator/index.d.ts +2 -1
  18. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  19. package/dest/contract_function_simulator/index.js +1 -0
  20. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +2 -3
  21. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  22. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +5 -4
  23. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +1 -1
  24. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
  25. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +1 -3
  26. package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts +16 -0
  27. package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts.map +1 -0
  28. package/dest/contract_function_simulator/noir-structs/message_tx_context.js +57 -0
  29. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +2 -4
  30. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  31. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +3 -5
  32. package/dest/contract_function_simulator/oracle/interfaces.d.ts +50 -45
  33. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  34. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  35. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  36. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +42 -0
  37. package/dest/contract_function_simulator/oracle/oracle.d.ts +45 -44
  38. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  39. package/dest/contract_function_simulator/oracle/oracle.js +187 -106
  40. package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
  41. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +54 -79
  42. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  43. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +100 -87
  44. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +95 -53
  45. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  46. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +205 -106
  47. package/dest/contract_logging.d.ts +22 -0
  48. package/dest/contract_logging.d.ts.map +1 -0
  49. package/dest/contract_logging.js +23 -0
  50. package/dest/contract_sync/contract_sync_service.d.ts +45 -0
  51. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
  52. package/dest/contract_sync/contract_sync_service.js +114 -0
  53. package/dest/contract_sync/helpers.d.ts +29 -0
  54. package/dest/contract_sync/helpers.d.ts.map +1 -0
  55. package/dest/contract_sync/{index.js → helpers.js} +13 -12
  56. package/dest/debug/pxe_debug_utils.d.ts +14 -10
  57. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  58. package/dest/debug/pxe_debug_utils.js +16 -15
  59. package/dest/entrypoints/client/bundle/index.d.ts +4 -1
  60. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  61. package/dest/entrypoints/client/bundle/index.js +3 -0
  62. package/dest/entrypoints/client/bundle/utils.d.ts +1 -1
  63. package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
  64. package/dest/entrypoints/client/bundle/utils.js +11 -2
  65. package/dest/entrypoints/client/lazy/index.d.ts +4 -1
  66. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  67. package/dest/entrypoints/client/lazy/index.js +3 -0
  68. package/dest/entrypoints/client/lazy/utils.d.ts +1 -1
  69. package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
  70. package/dest/entrypoints/client/lazy/utils.js +11 -2
  71. package/dest/entrypoints/server/index.d.ts +4 -2
  72. package/dest/entrypoints/server/index.d.ts.map +1 -1
  73. package/dest/entrypoints/server/index.js +3 -1
  74. package/dest/entrypoints/server/utils.js +9 -1
  75. package/dest/events/event_service.d.ts +4 -5
  76. package/dest/events/event_service.d.ts.map +1 -1
  77. package/dest/events/event_service.js +5 -6
  78. package/dest/logs/log_service.d.ts +6 -5
  79. package/dest/logs/log_service.d.ts.map +1 -1
  80. package/dest/logs/log_service.js +18 -28
  81. package/dest/messages/message_context_service.d.ts +17 -0
  82. package/dest/messages/message_context_service.d.ts.map +1 -0
  83. package/dest/messages/message_context_service.js +36 -0
  84. package/dest/notes/note_service.d.ts +7 -7
  85. package/dest/notes/note_service.d.ts.map +1 -1
  86. package/dest/notes/note_service.js +9 -9
  87. package/dest/notes_filter.d.ts +25 -0
  88. package/dest/notes_filter.d.ts.map +1 -0
  89. package/dest/notes_filter.js +4 -0
  90. package/dest/oracle_version.d.ts +3 -3
  91. package/dest/oracle_version.d.ts.map +1 -1
  92. package/dest/oracle_version.js +3 -3
  93. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
  94. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
  95. package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
  96. package/dest/private_kernel/hints/index.d.ts +1 -1
  97. package/dest/private_kernel/hints/index.js +1 -1
  98. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
  99. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
  100. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
  101. package/dest/private_kernel/hints/test_utils.d.ts +122 -0
  102. package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
  103. package/dest/private_kernel/hints/test_utils.js +203 -0
  104. package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
  105. package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
  106. package/dest/private_kernel/private_kernel_execution_prover.js +19 -11
  107. package/dest/private_kernel/private_kernel_oracle.d.ts +6 -2
  108. package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
  109. package/dest/private_kernel/private_kernel_oracle.js +7 -3
  110. package/dest/pxe.d.ts +74 -24
  111. package/dest/pxe.d.ts.map +1 -1
  112. package/dest/pxe.js +124 -74
  113. package/dest/storage/address_store/address_store.d.ts +1 -1
  114. package/dest/storage/address_store/address_store.d.ts.map +1 -1
  115. package/dest/storage/address_store/address_store.js +12 -11
  116. package/dest/storage/anchor_block_store/anchor_block_store.d.ts +9 -1
  117. package/dest/storage/anchor_block_store/anchor_block_store.d.ts.map +1 -1
  118. package/dest/storage/anchor_block_store/anchor_block_store.js +8 -1
  119. package/dest/storage/capsule_store/capsule_store.js +6 -8
  120. package/dest/storage/contract_store/contract_store.d.ts +42 -15
  121. package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
  122. package/dest/storage/contract_store/contract_store.js +157 -72
  123. package/dest/storage/metadata.d.ts +1 -1
  124. package/dest/storage/metadata.js +1 -1
  125. package/dest/storage/note_store/note_store.d.ts +13 -3
  126. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  127. package/dest/storage/note_store/note_store.js +173 -131
  128. package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
  129. package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
  130. package/dest/storage/private_event_store/private_event_store.js +126 -101
  131. package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
  132. package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
  133. package/dest/storage/tagging_store/recipient_tagging_store.js +31 -19
  134. package/dest/storage/tagging_store/sender_address_book_store.d.ts +1 -1
  135. package/dest/storage/tagging_store/sender_address_book_store.d.ts.map +1 -1
  136. package/dest/storage/tagging_store/sender_address_book_store.js +20 -14
  137. package/dest/storage/tagging_store/sender_tagging_store.d.ts +29 -28
  138. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  139. package/dest/storage/tagging_store/sender_tagging_store.js +233 -137
  140. package/dest/tagging/get_all_logs_by_tags.d.ts +1 -1
  141. package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
  142. package/dest/tagging/get_all_logs_by_tags.js +17 -3
  143. package/dest/tagging/index.d.ts +3 -3
  144. package/dest/tagging/index.d.ts.map +1 -1
  145. package/dest/tagging/index.js +1 -1
  146. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +4 -5
  147. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
  148. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +7 -7
  149. package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
  150. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
  151. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
  152. package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
  153. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
  154. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  155. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
  156. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
  157. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
  158. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
  159. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -7
  160. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  161. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +36 -24
  162. package/package.json +25 -16
  163. package/src/access_scopes.ts +9 -0
  164. package/src/block_synchronizer/block_synchronizer.ts +6 -0
  165. package/src/config/index.ts +1 -1
  166. package/src/config/package_info.ts +1 -1
  167. package/src/contract_function_simulator/contract_function_simulator.ts +360 -137
  168. package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
  169. package/src/contract_function_simulator/index.ts +1 -0
  170. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +8 -5
  171. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +1 -4
  172. package/src/contract_function_simulator/noir-structs/message_tx_context.ts +55 -0
  173. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +3 -6
  174. package/src/contract_function_simulator/oracle/interfaces.ts +60 -60
  175. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +135 -0
  176. package/src/contract_function_simulator/oracle/oracle.ts +198 -143
  177. package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
  178. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +126 -184
  179. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +308 -122
  180. package/src/contract_logging.ts +39 -0
  181. package/src/contract_sync/contract_sync_service.ts +181 -0
  182. package/src/contract_sync/{index.ts → helpers.ts} +21 -21
  183. package/src/debug/pxe_debug_utils.ts +48 -18
  184. package/src/entrypoints/client/bundle/index.ts +3 -0
  185. package/src/entrypoints/client/bundle/utils.ts +12 -2
  186. package/src/entrypoints/client/lazy/index.ts +3 -0
  187. package/src/entrypoints/client/lazy/utils.ts +12 -2
  188. package/src/entrypoints/server/index.ts +3 -1
  189. package/src/entrypoints/server/utils.ts +7 -7
  190. package/src/events/event_service.ts +4 -6
  191. package/src/logs/log_service.ts +25 -35
  192. package/src/messages/message_context_service.ts +45 -0
  193. package/src/notes/note_service.ts +9 -10
  194. package/src/notes_filter.ts +26 -0
  195. package/src/oracle_version.ts +3 -3
  196. package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
  197. package/src/private_kernel/hints/index.ts +1 -1
  198. package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
  199. package/src/private_kernel/hints/test_utils.ts +325 -0
  200. package/src/private_kernel/private_kernel_execution_prover.ts +19 -12
  201. package/src/private_kernel/private_kernel_oracle.ts +7 -7
  202. package/src/pxe.ts +228 -125
  203. package/src/storage/address_store/address_store.ts +15 -15
  204. package/src/storage/anchor_block_store/anchor_block_store.ts +8 -0
  205. package/src/storage/capsule_store/capsule_store.ts +8 -8
  206. package/src/storage/contract_store/contract_store.ts +186 -76
  207. package/src/storage/metadata.ts +1 -1
  208. package/src/storage/note_store/note_store.ts +195 -153
  209. package/src/storage/private_event_store/private_event_store.ts +151 -128
  210. package/src/storage/tagging_store/recipient_tagging_store.ts +38 -24
  211. package/src/storage/tagging_store/sender_address_book_store.ts +20 -14
  212. package/src/storage/tagging_store/sender_tagging_store.ts +287 -156
  213. package/src/tagging/get_all_logs_by_tags.ts +28 -4
  214. package/src/tagging/index.ts +2 -2
  215. package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +7 -10
  216. package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
  217. package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
  218. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +23 -10
  219. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
  220. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +27 -26
  221. package/dest/contract_sync/index.d.ts +0 -23
  222. package/dest/contract_sync/index.d.ts.map +0 -1
  223. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
  224. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
@@ -1,11 +1,13 @@
1
1
  import { Aes128 } from '@aztec/foundation/crypto/aes128';
2
2
  import { Fr } from '@aztec/foundation/curves/bn254';
3
- import { LogLevels, applyStringFormatting, createLogger } from '@aztec/foundation/log';
3
+ import { LogLevels, createLogger } from '@aztec/foundation/log';
4
+ import { isProtocolContract } from '@aztec/protocol-contracts';
4
5
  import { siloNullifier } from '@aztec/stdlib/hash';
5
6
  import { computeAddressSecret } from '@aztec/stdlib/keys';
6
7
  import { deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
7
8
  import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
8
9
  import { MerkleTreeId } from '@aztec/stdlib/trees';
10
+ import { createContractLogger, logContractMessage } from '../../contract_logging.js';
9
11
  import { EventService } from '../../events/event_service.js';
10
12
  import { LogService } from '../../logs/log_service.js';
11
13
  import { NoteService } from '../../notes/note_service.js';
@@ -13,6 +15,7 @@ import { ORACLE_VERSION } from '../../oracle_version.js';
13
15
  import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
14
16
  import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
15
17
  import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
18
+ import { MessageTxContext } from '../noir-structs/message_tx_context.js';
16
19
  import { NoteValidationRequest } from '../noir-structs/note_validation_request.js';
17
20
  import { UtilityContext } from '../noir-structs/utility_context.js';
18
21
  import { pickNotes } from '../pick_notes.js';
@@ -20,6 +23,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
20
23
  /**
21
24
  * The oracle for an execution of utility contract functions.
22
25
  */ export class UtilityExecutionOracle {
26
+ isMisc = true;
27
+ isUtility = true;
28
+ contractLogger;
29
+ offchainEffects = [];
23
30
  contractAddress;
24
31
  authWitnesses;
25
32
  capsules;
@@ -29,48 +36,56 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
29
36
  keyStore;
30
37
  addressStore;
31
38
  aztecNode;
32
- anchorBlockStore;
33
39
  recipientTaggingStore;
34
40
  senderAddressBookStore;
35
41
  capsuleStore;
36
42
  privateEventStore;
43
+ messageContextService;
44
+ contractSyncService;
37
45
  jobId;
38
- log;
46
+ logger;
39
47
  scopes;
40
- isMisc;
41
- isUtility;
42
- aztecNrDebugLog;
43
- constructor(contractAddress, /** List of transient auth witnesses to be used during this simulation */ authWitnesses, capsules, anchorBlockHeader, contractStore, noteStore, keyStore, addressStore, aztecNode, anchorBlockStore, recipientTaggingStore, senderAddressBookStore, capsuleStore, privateEventStore, jobId, log = createLogger('simulator:client_view_context'), scopes){
44
- this.contractAddress = contractAddress;
45
- this.authWitnesses = authWitnesses;
46
- this.capsules = capsules;
47
- this.anchorBlockHeader = anchorBlockHeader;
48
- this.contractStore = contractStore;
49
- this.noteStore = noteStore;
50
- this.keyStore = keyStore;
51
- this.addressStore = addressStore;
52
- this.aztecNode = aztecNode;
53
- this.anchorBlockStore = anchorBlockStore;
54
- this.recipientTaggingStore = recipientTaggingStore;
55
- this.senderAddressBookStore = senderAddressBookStore;
56
- this.capsuleStore = capsuleStore;
57
- this.privateEventStore = privateEventStore;
58
- this.jobId = jobId;
59
- this.log = log;
60
- this.scopes = scopes;
61
- this.isMisc = true;
62
- this.isUtility = true;
63
- this.aztecNrDebugLog = createLogger('aztec-nr:debug_log');
64
- }
65
- utilityAssertCompatibleOracleVersion(version) {
48
+ constructor(args){
49
+ this.contractAddress = args.contractAddress;
50
+ this.authWitnesses = args.authWitnesses;
51
+ this.capsules = args.capsules;
52
+ this.anchorBlockHeader = args.anchorBlockHeader;
53
+ this.contractStore = args.contractStore;
54
+ this.noteStore = args.noteStore;
55
+ this.keyStore = args.keyStore;
56
+ this.addressStore = args.addressStore;
57
+ this.aztecNode = args.aztecNode;
58
+ this.recipientTaggingStore = args.recipientTaggingStore;
59
+ this.senderAddressBookStore = args.senderAddressBookStore;
60
+ this.capsuleStore = args.capsuleStore;
61
+ this.privateEventStore = args.privateEventStore;
62
+ this.messageContextService = args.messageContextService;
63
+ this.contractSyncService = args.contractSyncService;
64
+ this.jobId = args.jobId;
65
+ this.logger = args.log ?? createLogger('simulator:client_view_context');
66
+ this.scopes = args.scopes;
67
+ }
68
+ assertCompatibleOracleVersion(version) {
69
+ // TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
70
+ // Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
71
+ // the expected pinned version or the current one. We want to allow for both the pinned and the current versions
72
+ // because we want this code to work with both the pinned and unpinned version since some branches do not have the
73
+ // pinned contracts (like e.g. next)
74
+ const LEGACY_ORACLE_VERSION = 12;
75
+ if (isProtocolContract(this.contractAddress)) {
76
+ if (version !== LEGACY_ORACLE_VERSION && version !== ORACLE_VERSION) {
77
+ throw new Error(`Expected legacy oracle version ${LEGACY_ORACLE_VERSION} or current oracle version ${ORACLE_VERSION} for alpha payload contract at ${this.contractAddress}, got ${version}.`);
78
+ }
79
+ return;
80
+ }
66
81
  if (version !== ORACLE_VERSION) {
67
82
  throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
68
83
  }
69
84
  }
70
- utilityGetRandomField() {
85
+ getRandomField() {
71
86
  return Fr.random();
72
87
  }
73
- utilityGetUtilityContext() {
88
+ getUtilityContext() {
74
89
  return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
75
90
  }
76
91
  /**
@@ -78,32 +93,54 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
78
93
  * @param pkMHash - The master public key hash.
79
94
  * @returns A Promise that resolves to nullifier keys.
80
95
  * @throws If the keys are not registered in the key store.
81
- */ utilityGetKeyValidationRequest(pkMHash) {
96
+ * @throws If scopes are defined and the account is not in the scopes.
97
+ */ async getKeyValidationRequest(pkMHash) {
98
+ // If scopes are defined, check that the key belongs to an account in the scopes.
99
+ if (this.scopes !== 'ALL_SCOPES' && this.scopes.length > 0) {
100
+ let hasAccess = false;
101
+ for(let i = 0; i < this.scopes.length && !hasAccess; i++){
102
+ if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
103
+ hasAccess = true;
104
+ }
105
+ }
106
+ if (!hasAccess) {
107
+ throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
108
+ }
109
+ }
82
110
  return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
83
111
  }
84
112
  /**
85
113
  * Fetches the index and sibling path of a leaf at a given block from the note hash tree.
86
- * @param blockHash - The block hash at which to get the membership witness.
87
- * @param leafValue - The leaf value
114
+ * @param blockHash - The hash of a block that contains the note hash tree root in which to find the
115
+ * membership witness.
116
+ * @param noteHash - The note hash to find in the note hash tree.
88
117
  * @returns The membership witness containing the leaf index and sibling path
89
- */ utilityGetNoteHashMembershipWitness(blockHash, leafValue) {
90
- return this.aztecNode.getNoteHashMembershipWitness(blockHash, leafValue);
118
+ */ getNoteHashMembershipWitness(blockHash, noteHash) {
119
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
91
120
  }
92
121
  /**
93
- * Fetches the index and sibling path of a leaf at a given block from the archive tree.
94
- * @param blockHash - The block hash at which to get the membership witness.
95
- * @param leafValue - The leaf value
122
+ * Fetches the index and sibling path of a block hash in the archive tree.
123
+ *
124
+ * Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
125
+ * its block hash is appended as a new leaf to the archive tree.
126
+ *
127
+ * @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
128
+ * witness.
129
+ * @param blockHash - The block hash to find in the archive tree.
96
130
  * @returns The membership witness containing the leaf index and sibling path
97
- */ utilityGetArchiveMembershipWitness(blockHash, leafValue) {
98
- return this.aztecNode.getArchiveMembershipWitness(blockHash, leafValue);
131
+ */ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
132
+ // Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
133
+ // hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
134
+ // membership witness as there is none.
135
+ return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
99
136
  }
100
137
  /**
101
138
  * Returns a nullifier membership witness for a given nullifier at a given block.
102
139
  * @param blockHash - The block hash at which to get the index.
103
140
  * @param nullifier - Nullifier we try to find witness for.
104
141
  * @returns The nullifier membership witness (if found).
105
- */ utilityGetNullifierMembershipWitness(blockHash, nullifier) {
106
- return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
142
+ */ getNullifierMembershipWitness(blockHash, nullifier) {
143
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
107
144
  }
108
145
  /**
109
146
  * Returns a low nullifier membership witness for a given nullifier at a given block.
@@ -113,23 +150,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
113
150
  * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
114
151
  * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
115
152
  * we are trying to prove non-inclusion for.
116
- */ utilityGetLowNullifierMembershipWitness(blockHash, nullifier) {
117
- return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
153
+ */ getLowNullifierMembershipWitness(blockHash, nullifier) {
154
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
118
155
  }
119
156
  /**
120
157
  * Returns a public data tree witness for a given leaf slot at a given block.
121
158
  * @param blockHash - The block hash at which to get the index.
122
159
  * @param leafSlot - The slot of the public data tree to get the witness for.
123
160
  * @returns - The witness
124
- */ utilityGetPublicDataWitness(blockHash, leafSlot) {
125
- return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
161
+ */ getPublicDataWitness(blockHash, leafSlot) {
162
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
126
163
  }
127
164
  /**
128
165
  * Fetches a block header of a given block.
129
166
  * @param blockNumber - The number of a block of which to get the block header.
130
167
  * @returns Block extracted from a block with block number `blockNumber`.
131
- */ async utilityGetBlockHeader(blockNumber) {
132
- const anchorBlockNumber = (await this.anchorBlockStore.getBlockHeader()).getBlockNumber();
168
+ */ async getBlockHeader(blockNumber) {
169
+ const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
133
170
  if (blockNumber > anchorBlockNumber) {
134
171
  throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
135
172
  }
@@ -137,14 +174,20 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
137
174
  return block?.header;
138
175
  }
139
176
  /**
140
- * Retrieve the complete address associated to a given address.
177
+ * Retrieve the public keys and partial address associated to a given address.
141
178
  * @param account - The account address.
142
- * @returns A complete address associated with the input address.
143
- * @throws An error if the account is not registered in the database.
144
- */ utilityGetPublicKeysAndPartialAddress(account) {
145
- return this.getCompleteAddress(account);
179
+ * @returns The public keys and partial address, or `undefined` if the account is not registered.
180
+ */ async tryGetPublicKeysAndPartialAddress(account) {
181
+ const completeAddress = await this.addressStore.getCompleteAddress(account);
182
+ if (!completeAddress) {
183
+ return undefined;
184
+ }
185
+ return {
186
+ publicKeys: completeAddress.publicKeys,
187
+ partialAddress: completeAddress.partialAddress
188
+ };
146
189
  }
147
- async getCompleteAddress(account) {
190
+ async getCompleteAddressOrFail(account) {
148
191
  const completeAddress = await this.addressStore.getCompleteAddress(account);
149
192
  if (!completeAddress) {
150
193
  throw new Error(`No public key registered for address ${account}.
@@ -156,10 +199,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
156
199
  * Returns a contract instance associated with an address or throws if not found.
157
200
  * @param address - Address.
158
201
  * @returns A contract instance.
159
- */ utilityGetContractInstance(address) {
160
- return this.getContractInstance(address);
161
- }
162
- async getContractInstance(address) {
202
+ */ async getContractInstance(address) {
163
203
  const instance = await this.contractStore.getContractInstance(address);
164
204
  if (!instance) {
165
205
  throw new Error(`No contract instance found for address ${address.toString()}`);
@@ -171,7 +211,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
171
211
  * for this transaction first, and falls back to the local database if not found.
172
212
  * @param messageHash - Hash of the message to authenticate.
173
213
  * @returns Authentication witness for the requested message hash.
174
- */ utilityGetAuthWitness(messageHash) {
214
+ */ getAuthWitness(messageHash) {
175
215
  return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
176
216
  }
177
217
  /**
@@ -195,8 +235,8 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
195
235
  * @param offset - The starting index for pagination.
196
236
  * @param status - The status of notes to fetch.
197
237
  * @returns Array of note data.
198
- */ async utilityGetNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
199
- const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore, this.jobId);
238
+ */ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
239
+ const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
200
240
  const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
201
241
  return pickNotes(dbNotes, {
202
242
  selects: selectByIndexes.slice(0, numSelects).map((index, i)=>({
@@ -224,22 +264,25 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
224
264
  * Check if a nullifier exists in the nullifier tree.
225
265
  * @param innerNullifier - The inner nullifier.
226
266
  * @returns A boolean indicating whether the nullifier exists in the tree or not.
227
- */ async utilityCheckNullifierExists(innerNullifier) {
228
- const nullifier = await siloNullifier(this.contractAddress, innerNullifier);
229
- const [leafIndex] = await this.aztecNode.findLeavesIndexes('latest', MerkleTreeId.NULLIFIER_TREE, [
267
+ */ async checkNullifierExists(innerNullifier) {
268
+ const [nullifier, anchorBlockHash] = await Promise.all([
269
+ siloNullifier(this.contractAddress, innerNullifier),
270
+ this.anchorBlockHeader.hash()
271
+ ]);
272
+ const [leafIndex] = await this.aztecNode.findLeavesIndexes(anchorBlockHash, MerkleTreeId.NULLIFIER_TREE, [
230
273
  nullifier
231
274
  ]);
232
275
  return leafIndex?.data !== undefined;
233
276
  }
234
277
  /**
235
- * Fetches a message from the executionStore, given its key.
278
+ * Returns the membership witness of an un-nullified L1 to L2 message.
236
279
  * @param contractAddress - Address of a contract by which the message was emitted.
237
280
  * @param messageHash - Hash of the message.
238
281
  * @param secret - Secret used to compute a nullifier.
239
282
  * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
240
283
  * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
241
- */ async utilityGetL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
242
- const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
284
+ */ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
285
+ const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
243
286
  return new MessageLoadOracleInputs(messageIndex, siblingPath);
244
287
  }
245
288
  /**
@@ -248,30 +291,36 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
248
291
  * @param contractAddress - The address to read storage from.
249
292
  * @param startStorageSlot - The starting storage slot.
250
293
  * @param numberOfElements - Number of elements to read from the starting storage slot.
251
- */ async utilityStorageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
252
- const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
253
- const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
254
- this.log.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
255
- return values;
294
+ */ storageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
295
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
296
+ const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
297
+ const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
298
+ this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
299
+ return values;
300
+ });
256
301
  }
257
- utilityDebugLog(level, message, fields) {
302
+ /**
303
+ * Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
304
+ */ async #getContractLogger() {
305
+ if (!this.contractLogger) {
306
+ // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
307
+ // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
308
+ this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
309
+ instanceId: this.jobId
310
+ });
311
+ }
312
+ return this.contractLogger;
313
+ }
314
+ async log(level, message, fields) {
258
315
  if (!LogLevels[level]) {
259
- throw new Error(`Invalid debug log level: ${level}`);
316
+ throw new Error(`Invalid log level: ${level}`);
260
317
  }
261
- const levelName = LogLevels[level];
262
- this.aztecNrDebugLog[levelName](`${applyStringFormatting(message, fields)}`);
263
- }
264
- async utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
265
- const logService = new LogService(this.aztecNode, this.anchorBlockStore, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
266
- const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore, this.jobId);
267
- // It is acceptable to run the following operations in parallel for several reasons:
268
- // 1. syncTaggedLogs does not write to the note store — it only stores the pending tagged logs in a capsule array,
269
- // which is then processed in Noir after this handler returns.
270
- // 2. Even if syncTaggedLogs did write to the note store, it would not cause inconsistent state.
271
- await Promise.all([
272
- logService.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes),
273
- noteService.syncNoteNullifiers(this.contractAddress)
274
- ]);
318
+ const logger = await this.#getContractLogger();
319
+ logContractMessage(logger, LogLevels[level], message, fields);
320
+ }
321
+ async fetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
322
+ const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
323
+ await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
275
324
  }
276
325
  /**
277
326
  * Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
@@ -282,18 +331,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
282
331
  * @param contractAddress - The address of the contract that the logs are tagged for.
283
332
  * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
284
333
  * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
285
- */ async utilityValidateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
334
+ */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen) {
286
335
  // TODO(#10727): allow other contracts to store notes
287
336
  if (!this.contractAddress.equals(contractAddress)) {
288
337
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
289
338
  }
290
339
  // We read all note and event validation requests and process them all concurrently. This makes the process much
291
340
  // faster as we don't need to wait for the network round-trip.
292
- const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
293
- const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
294
- const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockStore, this.jobId);
341
+ const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
342
+ const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
343
+ const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
295
344
  const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, request.recipient));
296
- const eventService = new EventService(this.anchorBlockStore, this.aztecNode, this.privateEventStore, this.jobId);
345
+ const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
297
346
  const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, request.recipient));
298
347
  await Promise.all([
299
348
  ...noteStorePromises,
@@ -303,7 +352,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
303
352
  await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
304
353
  await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
305
354
  }
306
- async utilityBulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
355
+ async bulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
307
356
  // TODO(#10727): allow other contracts to process partial notes
308
357
  if (!this.contractAddress.equals(contractAddress)) {
309
358
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
@@ -311,14 +360,33 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
311
360
  // We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
312
361
  // don't need to wait for the network round-trip.
313
362
  const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
314
- const logService = new LogService(this.aztecNode, this.anchorBlockStore, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
363
+ const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
315
364
  const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
316
365
  // Requests are cleared once we're done.
317
366
  await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
318
367
  // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
319
368
  await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
320
369
  }
321
- utilityStoreCapsule(contractAddress, slot, capsule) {
370
+ async utilityResolveMessageContexts(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot) {
371
+ try {
372
+ if (!this.contractAddress.equals(contractAddress)) {
373
+ throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
374
+ }
375
+ const requestCapsules = await this.capsuleStore.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId);
376
+ const txHashes = requestCapsules.map((fields, i)=>{
377
+ if (fields.length !== 1) {
378
+ throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
379
+ }
380
+ return fields[0];
381
+ });
382
+ const maybeMessageContexts = await this.messageContextService.resolveMessageContexts(txHashes, this.anchorBlockHeader.getBlockNumber());
383
+ // Leave response in response capsule array.
384
+ await this.capsuleStore.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageTxContext.toSerializedOption), this.jobId);
385
+ } finally{
386
+ await this.capsuleStore.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId);
387
+ }
388
+ }
389
+ storeCapsule(contractAddress, slot, capsule) {
322
390
  if (!contractAddress.equals(this.contractAddress)) {
323
391
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
324
392
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -326,7 +394,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
326
394
  this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
327
395
  return Promise.resolve();
328
396
  }
329
- async utilityLoadCapsule(contractAddress, slot) {
397
+ async loadCapsule(contractAddress, slot) {
330
398
  if (!contractAddress.equals(this.contractAddress)) {
331
399
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
332
400
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -334,7 +402,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
334
402
  return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
335
403
  this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
336
404
  }
337
- utilityDeleteCapsule(contractAddress, slot) {
405
+ deleteCapsule(contractAddress, slot) {
338
406
  if (!contractAddress.equals(this.contractAddress)) {
339
407
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
340
408
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -342,15 +410,24 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
342
410
  this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
343
411
  return Promise.resolve();
344
412
  }
345
- utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
413
+ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
346
414
  if (!contractAddress.equals(this.contractAddress)) {
347
415
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
348
416
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
349
417
  }
350
418
  return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
351
419
  }
420
+ /**
421
+ * Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
422
+ * stored notes or events are discovered.
423
+ */ invalidateContractSyncCache(contractAddress, scopes) {
424
+ if (!contractAddress.equals(this.contractAddress)) {
425
+ throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
426
+ }
427
+ this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
428
+ }
352
429
  // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
353
- utilityAes128Decrypt(ciphertext, iv, symKey) {
430
+ aes128Decrypt(ciphertext, iv, symKey) {
354
431
  const aes128 = new Aes128();
355
432
  return aes128.decryptBufferCBC(ciphertext, iv, symKey);
356
433
  }
@@ -359,14 +436,36 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
359
436
  * @param address - The address to get the secret for.
360
437
  * @param ephPk - The ephemeral public key to get the secret for.
361
438
  * @returns The secret for the given address.
362
- */ utilityGetSharedSecret(address, ephPk) {
363
- return this.getSharedSecret(address, ephPk);
364
- }
365
- async getSharedSecret(address, ephPk) {
439
+ */ async getSharedSecret(address, ephPk) {
366
440
  // TODO(#12656): return an app-siloed secret
367
- const recipientCompleteAddress = await this.getCompleteAddress(address);
441
+ const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
368
442
  const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
369
443
  const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
370
444
  return deriveEcdhSharedSecret(addressSecret, ephPk);
371
445
  }
446
+ emitOffchainEffect(data) {
447
+ this.offchainEffects.push({
448
+ data,
449
+ contractAddress: this.contractAddress
450
+ });
451
+ return Promise.resolve();
452
+ }
453
+ /** Returns offchain effects collected during execution. */ getOffchainEffects() {
454
+ return this.offchainEffects;
455
+ }
456
+ /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
457
+ const [response] = await Promise.all([
458
+ query(),
459
+ (async ()=>{
460
+ const header = await this.aztecNode.getBlockHeader(blockHash);
461
+ if (!header) {
462
+ throw new Error(`Could not find block header for block hash ${blockHash}`);
463
+ }
464
+ if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
465
+ throw new Error(`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${await this.anchorBlockHeader.hash()}).`);
466
+ }
467
+ })()
468
+ ]);
469
+ return response;
470
+ }
372
471
  }
@@ -0,0 +1,22 @@
1
+ import type { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { type LogLevel, type Logger } from '@aztec/foundation/log';
3
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ import type { DebugLog } from '@aztec/stdlib/logs';
5
+ /** Resolves a contract address to a human-readable name, if available. */
6
+ export type ContractNameResolver = (address: AztecAddress) => Promise<string | undefined>;
7
+ /**
8
+ * Creates a logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
9
+ */
10
+ export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, options?: {
11
+ instanceId?: string;
12
+ }): Promise<Logger>;
13
+ /**
14
+ * Formats and emits a single contract log message through the given logger.
15
+ */
16
+ export declare function logContractMessage(logger: Logger, level: LogLevel, message: string, fields: Fr[]): void;
17
+ /**
18
+ * Displays debug logs collected during public function simulation,
19
+ * using the `contract_log::` prefixed logger format.
20
+ */
21
+ export declare function displayDebugLogs(debugLogs: DebugLog[], getContractName: ContractNameResolver): Promise<void>;
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfbG9nZ2luZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyYWN0X2xvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssTUFBTSxFQUF1QyxNQUFNLHVCQUF1QixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELDBFQUEwRTtBQUMxRSxNQUFNLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFFMUY7O0dBRUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGVBQWUsRUFBRSxvQkFBb0IsRUFDckMsT0FBTyxDQUFDLEVBQUU7SUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUNoQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBS2pCO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0Isa0JBQWtCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FFdkc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxFQUFFLGVBQWUsRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBS2xIIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"contract_logging.d.ts","sourceRoot":"","sources":["../src/contract_logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAuC,MAAM,uBAAuB,CAAC;AACxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAE1F;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,oBAAoB,EACrC,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAEvG;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlH"}
@@ -0,0 +1,23 @@
1
+ import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
2
+ /**
3
+ * Creates a logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
4
+ */ export async function createContractLogger(contractAddress, getContractName, options) {
5
+ const addrAbbrev = contractAddress.toString().slice(0, 10);
6
+ const name = await getContractName(contractAddress);
7
+ const module = name ? `contract_log::${name}(${addrAbbrev})` : `contract_log::Unknown(${addrAbbrev})`;
8
+ return createLogger(module, options);
9
+ }
10
+ /**
11
+ * Formats and emits a single contract log message through the given logger.
12
+ */ export function logContractMessage(logger, level, message, fields) {
13
+ logger[level](applyStringFormatting(message, fields));
14
+ }
15
+ /**
16
+ * Displays debug logs collected during public function simulation,
17
+ * using the `contract_log::` prefixed logger format.
18
+ */ export async function displayDebugLogs(debugLogs, getContractName) {
19
+ for (const log of debugLogs){
20
+ const logger = await createContractLogger(log.contractAddress, getContractName);
21
+ logContractMessage(logger, log.level, log.message, log.fields);
22
+ }
23
+ }
@@ -0,0 +1,45 @@
1
+ import type { Logger } from '@aztec/foundation/log';
2
+ import type { FunctionCall, FunctionSelector } from '@aztec/stdlib/abi';
3
+ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ import type { AztecNode } from '@aztec/stdlib/interfaces/client';
5
+ import type { BlockHeader } from '@aztec/stdlib/tx';
6
+ import type { AccessScopes } from '../access_scopes.js';
7
+ import type { StagedStore } from '../job_coordinator/job_coordinator.js';
8
+ import type { ContractStore } from '../storage/contract_store/contract_store.js';
9
+ import type { NoteStore } from '../storage/note_store/note_store.js';
10
+ /**
11
+ * Service for syncing the private state of contracts and verifying that the PXE holds the current class artifact.
12
+ * It uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
13
+ *
14
+ * TODO: The StagedStore naming is broken here. Figure out a better name.
15
+ */
16
+ export declare class ContractSyncService implements StagedStore {
17
+ #private;
18
+ private aztecNode;
19
+ private contractStore;
20
+ private noteStore;
21
+ private log;
22
+ readonly storeName = "contract_sync";
23
+ private syncedContracts;
24
+ private excludedFromSync;
25
+ constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
26
+ /** Sets contracts that should be skipped during sync for a specific job. */
27
+ setExcludedFromSync(jobId: string, addresses: Set<string>): void;
28
+ /**
29
+ * Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
30
+ * Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
31
+ * @param contractAddress - The address of the contract to sync.
32
+ * @param functionToInvokeAfterSync - The function selector that will be called after sync (used to validate it's
33
+ * not sync_state itself).
34
+ * @param utilityExecutor - Executor function for running the sync_state utility function.
35
+ * @param scopes - Access scopes to pass through to the utility executor (affects whose account's private state is discovered).
36
+ */
37
+ ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall, scopes: AccessScopes) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string, scopes: AccessScopes): Promise<void>;
38
+ /** Clears sync cache entries for the given scopes of a contract. Also clears the ALL_SCOPES entry. */
39
+ invalidateContractForScopes(contractAddress: AztecAddress, scopes: AztecAddress[]): void;
40
+ /** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
41
+ wipe(): void;
42
+ commit(jobId: string): Promise<void>;
43
+ discardStaged(jobId: string): Promise<void>;
44
+ }
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsR0FBRztJQWRiLFFBQVEsQ0FBQyxTQUFTLG1CQUFtQjtJQUtyQyxPQUFPLENBQUMsZUFBZSxDQUF5QztJQUdoRSxPQUFPLENBQUMsZ0JBQWdCLENBQXVDO0lBRS9ELFlBQ1UsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsR0FBRyxFQUFFLE1BQU0sRUFDakI7SUFFSiw0RUFBNEU7SUFDNUUsbUJBQW1CLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FFL0Q7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixlQUFlLEVBQUUsWUFBWSxFQUM3Qix5QkFBeUIsRUFBRSxnQkFBZ0IsR0FBRyxJQUFJLEVBQ2xELGVBQWUsRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQzNFLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDYixNQUFNLEVBQUUsWUFBWSxHQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBaUJmO0lBRUQsc0dBQXNHO0lBQ3RHLDJCQUEyQixDQUFDLGVBQWUsRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxHQUFHLElBQUksQ0FNdkY7SUE0QkQsZ0ZBQWdGO0lBQ2hGLElBQUksSUFBSSxJQUFJLENBR1g7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSW5DO0lBRUQsYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU0xQztDQTJDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"contract_sync_service.d.ts","sourceRoot":"","sources":["../../src/contract_sync/contract_sync_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAGrE;;;;;GAKG;AACH,qBAAa,mBAAoB,YAAW,WAAW;;IAYnD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAdb,QAAQ,CAAC,SAAS,mBAAmB;IAKrC,OAAO,CAAC,eAAe,CAAyC;IAGhE,OAAO,CAAC,gBAAgB,CAAuC;IAE/D,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAE/D;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EAC3E,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiBf;IAED,sGAAsG;IACtG,2BAA2B,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAMvF;IA4BD,gFAAgF;IAChF,IAAI,IAAI,IAAI,CAGX;IAED,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAInC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1C;CA2CF"}