@aztec/pxe 0.0.1-commit.ff7989d6c → 0.0.1-commit.fff30aa

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 (223) hide show
  1. package/dest/bin/check_oracle_version.js +4 -4
  2. package/dest/block_synchronizer/block_synchronizer.d.ts +3 -1
  3. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
  4. package/dest/block_synchronizer/block_synchronizer.js +10 -0
  5. package/dest/config/package_info.js +1 -1
  6. package/dest/contract_function_simulator/contract_function_simulator.d.ts +13 -5
  7. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  8. package/dest/contract_function_simulator/contract_function_simulator.js +39 -12
  9. package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
  10. package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
  11. package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
  12. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
  13. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  14. package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
  15. package/dest/contract_function_simulator/index.d.ts +2 -1
  16. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  17. package/dest/contract_function_simulator/index.js +1 -0
  18. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +4 -6
  19. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  20. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +8 -10
  21. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
  22. package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
  23. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
  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 +2 -4
  26. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +4 -7
  27. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  28. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +6 -11
  29. package/dest/contract_function_simulator/oracle/interfaces.d.ts +61 -45
  30. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  31. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  32. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  33. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
  34. package/dest/contract_function_simulator/oracle/oracle.d.ts +75 -44
  35. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  36. package/dest/contract_function_simulator/oracle/oracle.js +281 -96
  37. package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
  38. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +24 -50
  39. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  40. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +53 -75
  41. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +94 -60
  42. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  43. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +276 -110
  44. package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
  45. package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
  46. package/dest/contract_function_simulator/pick_notes.js +20 -3
  47. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +1 -1
  48. package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
  49. package/dest/contract_function_simulator/proxied_contract_data_source.js +3 -0
  50. package/dest/contract_logging.d.ts +9 -4
  51. package/dest/contract_logging.d.ts.map +1 -1
  52. package/dest/contract_logging.js +21 -6
  53. package/dest/contract_sync/contract_sync_service.d.ts +6 -5
  54. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
  55. package/dest/contract_sync/contract_sync_service.js +62 -43
  56. package/dest/contract_sync/helpers.d.ts +2 -3
  57. package/dest/contract_sync/helpers.d.ts.map +1 -1
  58. package/dest/contract_sync/helpers.js +7 -2
  59. package/dest/debug/pxe_debug_utils.d.ts +3 -3
  60. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  61. package/dest/entrypoints/client/bundle/index.d.ts +1 -2
  62. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  63. package/dest/entrypoints/client/bundle/index.js +0 -1
  64. package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
  65. package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
  66. package/dest/entrypoints/client/bundle/utils.js +2 -2
  67. package/dest/entrypoints/client/lazy/index.d.ts +1 -2
  68. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  69. package/dest/entrypoints/client/lazy/index.js +0 -1
  70. package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
  71. package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
  72. package/dest/entrypoints/client/lazy/utils.js +2 -2
  73. package/dest/entrypoints/pxe_creation_options.d.ts +3 -1
  74. package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
  75. package/dest/entrypoints/pxe_creation_options.js +3 -1
  76. package/dest/entrypoints/server/index.d.ts +2 -3
  77. package/dest/entrypoints/server/index.d.ts.map +1 -1
  78. package/dest/entrypoints/server/index.js +1 -2
  79. package/dest/entrypoints/server/utils.d.ts +2 -2
  80. package/dest/entrypoints/server/utils.d.ts.map +1 -1
  81. package/dest/entrypoints/server/utils.js +2 -2
  82. package/dest/events/event_service.d.ts +3 -2
  83. package/dest/events/event_service.d.ts.map +1 -1
  84. package/dest/events/event_service.js +16 -4
  85. package/dest/events/private_event_filter_validator.d.ts +3 -2
  86. package/dest/events/private_event_filter_validator.d.ts.map +1 -1
  87. package/dest/events/private_event_filter_validator.js +15 -0
  88. package/dest/logs/log_service.d.ts +7 -8
  89. package/dest/logs/log_service.d.ts.map +1 -1
  90. package/dest/logs/log_service.js +29 -39
  91. package/dest/messages/message_context_service.d.ts +17 -0
  92. package/dest/messages/message_context_service.d.ts.map +1 -0
  93. package/dest/messages/message_context_service.js +36 -0
  94. package/dest/notes/note_service.d.ts +4 -5
  95. package/dest/notes/note_service.d.ts.map +1 -1
  96. package/dest/notes/note_service.js +14 -5
  97. package/dest/notes_filter.d.ts +2 -3
  98. package/dest/notes_filter.d.ts.map +1 -1
  99. package/dest/oracle_version.d.ts +4 -3
  100. package/dest/oracle_version.d.ts.map +1 -1
  101. package/dest/oracle_version.js +20 -10
  102. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
  103. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
  104. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +125 -64
  105. package/dest/private_kernel/hints/test_utils.d.ts +122 -0
  106. package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
  107. package/dest/private_kernel/hints/test_utils.js +203 -0
  108. package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
  109. package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
  110. package/dest/private_kernel/private_kernel_execution_prover.js +17 -12
  111. package/dest/private_kernel/private_kernel_oracle.d.ts +5 -5
  112. package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
  113. package/dest/private_kernel/private_kernel_oracle.js +12 -15
  114. package/dest/pxe.d.ts +10 -7
  115. package/dest/pxe.d.ts.map +1 -1
  116. package/dest/pxe.js +51 -28
  117. package/dest/storage/anchor_block_store/anchor_block_store.js +1 -1
  118. package/dest/storage/capsule_store/capsule_service.d.ts +21 -0
  119. package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
  120. package/dest/storage/capsule_store/capsule_service.js +50 -0
  121. package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
  122. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
  123. package/dest/storage/capsule_store/capsule_store.js +36 -28
  124. package/dest/storage/capsule_store/index.d.ts +2 -1
  125. package/dest/storage/capsule_store/index.d.ts.map +1 -1
  126. package/dest/storage/capsule_store/index.js +1 -0
  127. package/dest/storage/contract_store/contract_store.d.ts +1 -1
  128. package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
  129. package/dest/storage/contract_store/contract_store.js +4 -2
  130. package/dest/storage/metadata.d.ts +1 -1
  131. package/dest/storage/metadata.js +1 -1
  132. package/dest/storage/note_store/note_store.d.ts +1 -1
  133. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  134. package/dest/storage/note_store/note_store.js +2 -2
  135. package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
  136. package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
  137. package/dest/storage/private_event_store/private_event_store.js +3 -0
  138. package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
  139. package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
  140. package/dest/storage/tagging_store/sender_tagging_store.d.ts +29 -28
  141. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  142. package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
  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 +4 -18
  149. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
  150. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
  151. package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
  152. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
  153. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  154. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
  155. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
  156. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
  157. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
  158. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -7
  159. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  160. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +36 -24
  161. package/package.json +16 -16
  162. package/src/bin/check_oracle_version.ts +4 -4
  163. package/src/block_synchronizer/block_synchronizer.ts +12 -0
  164. package/src/config/package_info.ts +1 -1
  165. package/src/contract_function_simulator/contract_function_simulator.ts +60 -24
  166. package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
  167. package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
  168. package/src/contract_function_simulator/index.ts +1 -0
  169. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -9
  170. package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
  171. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
  172. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -10
  173. package/src/contract_function_simulator/oracle/interfaces.ts +82 -54
  174. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
  175. package/src/contract_function_simulator/oracle/oracle.ts +363 -139
  176. package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
  177. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +65 -95
  178. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +451 -147
  179. package/src/contract_function_simulator/pick_notes.ts +22 -3
  180. package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
  181. package/src/contract_logging.ts +18 -5
  182. package/src/contract_sync/contract_sync_service.ts +99 -75
  183. package/src/contract_sync/helpers.ts +4 -4
  184. package/src/debug/pxe_debug_utils.ts +3 -3
  185. package/src/entrypoints/client/bundle/index.ts +0 -1
  186. package/src/entrypoints/client/bundle/utils.ts +2 -3
  187. package/src/entrypoints/client/lazy/index.ts +0 -1
  188. package/src/entrypoints/client/lazy/utils.ts +2 -3
  189. package/src/entrypoints/pxe_creation_options.ts +7 -0
  190. package/src/entrypoints/server/index.ts +1 -2
  191. package/src/entrypoints/server/utils.ts +2 -3
  192. package/src/events/event_service.ts +17 -4
  193. package/src/events/private_event_filter_validator.ts +21 -1
  194. package/src/logs/log_service.ts +59 -75
  195. package/src/messages/message_context_service.ts +44 -0
  196. package/src/notes/note_service.ts +18 -8
  197. package/src/notes_filter.ts +1 -3
  198. package/src/oracle_version.ts +20 -10
  199. package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +157 -110
  200. package/src/private_kernel/hints/test_utils.ts +325 -0
  201. package/src/private_kernel/private_kernel_execution_prover.ts +17 -15
  202. package/src/private_kernel/private_kernel_oracle.ts +14 -14
  203. package/src/pxe.ts +78 -33
  204. package/src/storage/anchor_block_store/anchor_block_store.ts +1 -1
  205. package/src/storage/capsule_store/capsule_service.ts +90 -0
  206. package/src/storage/capsule_store/capsule_store.ts +44 -26
  207. package/src/storage/capsule_store/index.ts +1 -0
  208. package/src/storage/contract_store/contract_store.ts +8 -6
  209. package/src/storage/metadata.ts +1 -1
  210. package/src/storage/note_store/note_store.ts +2 -5
  211. package/src/storage/private_event_store/private_event_store.ts +4 -0
  212. package/src/storage/tagging_store/recipient_tagging_store.ts +9 -5
  213. package/src/storage/tagging_store/sender_tagging_store.ts +185 -138
  214. package/src/tagging/index.ts +2 -2
  215. package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +8 -21
  216. package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
  217. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +23 -10
  218. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
  219. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +27 -26
  220. package/dest/access_scopes.d.ts +0 -9
  221. package/dest/access_scopes.d.ts.map +0 -1
  222. package/dest/access_scopes.js +0 -6
  223. package/src/access_scopes.ts +0 -9
@@ -1,16 +1,18 @@
1
1
  import { Aes128 } from '@aztec/foundation/crypto/aes128';
2
2
  import { Fr } from '@aztec/foundation/curves/bn254';
3
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
- import { deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
7
+ import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
7
8
  import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
8
9
  import { MerkleTreeId } from '@aztec/stdlib/trees';
9
- import { createContractLogger, logContractMessage } from '../../contract_logging.js';
10
+ import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
10
11
  import { EventService } from '../../events/event_service.js';
11
12
  import { LogService } from '../../logs/log_service.js';
12
13
  import { NoteService } from '../../notes/note_service.js';
13
- import { ORACLE_VERSION } from '../../oracle_version.js';
14
+ import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
15
+ import { EphemeralArrayService } from '../ephemeral_array_service.js';
14
16
  import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
15
17
  import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
16
18
  import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
@@ -24,6 +26,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
24
26
  isMisc = true;
25
27
  isUtility = true;
26
28
  contractLogger;
29
+ aztecnrLogger;
30
+ offchainEffects = [];
31
+ ephemeralArrayService = new EphemeralArrayService();
32
+ // We store oracle version to be able to show a nice error message when an oracle handler is missing.
33
+ contractOracleVersion;
27
34
  contractAddress;
28
35
  authWitnesses;
29
36
  capsules;
@@ -35,10 +42,13 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
35
42
  aztecNode;
36
43
  recipientTaggingStore;
37
44
  senderAddressBookStore;
38
- capsuleStore;
45
+ capsuleService;
39
46
  privateEventStore;
47
+ messageContextService;
48
+ contractSyncService;
49
+ l2TipsStore;
40
50
  jobId;
41
- log;
51
+ logger;
42
52
  scopes;
43
53
  constructor(args){
44
54
  this.contractAddress = args.contractAddress;
@@ -52,21 +62,51 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
52
62
  this.aztecNode = args.aztecNode;
53
63
  this.recipientTaggingStore = args.recipientTaggingStore;
54
64
  this.senderAddressBookStore = args.senderAddressBookStore;
55
- this.capsuleStore = args.capsuleStore;
65
+ this.capsuleService = args.capsuleService;
56
66
  this.privateEventStore = args.privateEventStore;
67
+ this.messageContextService = args.messageContextService;
68
+ this.contractSyncService = args.contractSyncService;
69
+ this.l2TipsStore = args.l2TipsStore;
57
70
  this.jobId = args.jobId;
58
- this.log = args.log ?? createLogger('simulator:client_view_context');
71
+ this.logger = args.log ?? createLogger('simulator:client_view_context');
59
72
  this.scopes = args.scopes;
60
73
  }
61
- utilityAssertCompatibleOracleVersion(version) {
62
- if (version !== ORACLE_VERSION) {
63
- throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
74
+ assertCompatibleOracleVersion(major, minor) {
75
+ // TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
76
+ // Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
77
+ // the expected pinned version or the current one. We want to allow for both the pinned and the current versions
78
+ // because we want this code to work with both the pinned and unpinned version since some branches do not have the
79
+ // pinned contracts (like e.g. next)
80
+ const LEGACY_ORACLE_VERSION = 12;
81
+ if (isProtocolContract(this.contractAddress)) {
82
+ if (major !== LEGACY_ORACLE_VERSION && major !== ORACLE_VERSION_MAJOR) {
83
+ const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
84
+ throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION_MAJOR}, got ${major})`);
85
+ }
86
+ this.contractOracleVersion = {
87
+ major,
88
+ minor
89
+ };
90
+ return;
91
+ }
92
+ if (major !== ORACLE_VERSION_MAJOR) {
93
+ const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
94
+ throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`);
64
95
  }
96
+ // Major matches - store both major and minor for later diagnostics (e.g. when an oracle is not found)
97
+ this.contractOracleVersion = {
98
+ major,
99
+ minor
100
+ };
65
101
  }
66
- utilityGetRandomField() {
102
+ // Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
103
+ nonOracleFunctionGetContractOracleVersion() {
104
+ return this.contractOracleVersion;
105
+ }
106
+ getRandomField() {
67
107
  return Fr.random();
68
108
  }
69
- utilityGetUtilityContext() {
109
+ getUtilityContext() {
70
110
  return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
71
111
  }
72
112
  /**
@@ -75,29 +115,26 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
75
115
  * @returns A Promise that resolves to nullifier keys.
76
116
  * @throws If the keys are not registered in the key store.
77
117
  * @throws If scopes are defined and the account is not in the scopes.
78
- */ async utilityGetKeyValidationRequest(pkMHash) {
79
- // If scopes are defined, check that the key belongs to an account in the scopes.
80
- if (this.scopes !== 'ALL_SCOPES' && this.scopes.length > 0) {
81
- let hasAccess = false;
82
- for(let i = 0; i < this.scopes.length && !hasAccess; i++){
83
- if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
84
- hasAccess = true;
85
- }
86
- }
87
- if (!hasAccess) {
88
- throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
118
+ */ async getKeyValidationRequest(pkMHash) {
119
+ let hasAccess = false;
120
+ for(let i = 0; i < this.scopes.length && !hasAccess; i++){
121
+ if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
122
+ hasAccess = true;
89
123
  }
90
124
  }
125
+ if (!hasAccess) {
126
+ throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
127
+ }
91
128
  return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
92
129
  }
93
130
  /**
94
131
  * Fetches the index and sibling path of a leaf at a given block from the note hash tree.
95
- * @param anchorBlockHash - The hash of a block that contains the note hash tree root in which to find the membership
96
- * witness.
132
+ * @param blockHash - The hash of a block that contains the note hash tree root in which to find the
133
+ * membership witness.
97
134
  * @param noteHash - The note hash to find in the note hash tree.
98
135
  * @returns The membership witness containing the leaf index and sibling path
99
- */ utilityGetNoteHashMembershipWitness(anchorBlockHash, noteHash) {
100
- return this.aztecNode.getNoteHashMembershipWitness(anchorBlockHash, noteHash);
136
+ */ getNoteHashMembershipWitness(blockHash, noteHash) {
137
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
101
138
  }
102
139
  /**
103
140
  * Fetches the index and sibling path of a block hash in the archive tree.
@@ -105,20 +142,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
105
142
  * Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
106
143
  * its block hash is appended as a new leaf to the archive tree.
107
144
  *
108
- * @param anchorBlockHash - The hash of a block that contains the archive tree root in which to find the membership
145
+ * @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
109
146
  * witness.
110
147
  * @param blockHash - The block hash to find in the archive tree.
111
148
  * @returns The membership witness containing the leaf index and sibling path
112
- */ utilityGetBlockHashMembershipWitness(anchorBlockHash, blockHash) {
113
- return this.aztecNode.getBlockHashMembershipWitness(anchorBlockHash, blockHash);
149
+ */ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
150
+ // Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
151
+ // hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
152
+ // membership witness as there is none.
153
+ return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
114
154
  }
115
155
  /**
116
156
  * Returns a nullifier membership witness for a given nullifier at a given block.
117
157
  * @param blockHash - The block hash at which to get the index.
118
158
  * @param nullifier - Nullifier we try to find witness for.
119
159
  * @returns The nullifier membership witness (if found).
120
- */ utilityGetNullifierMembershipWitness(blockHash, nullifier) {
121
- return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
160
+ */ getNullifierMembershipWitness(blockHash, nullifier) {
161
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
122
162
  }
123
163
  /**
124
164
  * Returns a low nullifier membership witness for a given nullifier at a given block.
@@ -128,22 +168,22 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
128
168
  * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
129
169
  * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
130
170
  * we are trying to prove non-inclusion for.
131
- */ utilityGetLowNullifierMembershipWitness(blockHash, nullifier) {
132
- return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
171
+ */ getLowNullifierMembershipWitness(blockHash, nullifier) {
172
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
133
173
  }
134
174
  /**
135
175
  * Returns a public data tree witness for a given leaf slot at a given block.
136
176
  * @param blockHash - The block hash at which to get the index.
137
177
  * @param leafSlot - The slot of the public data tree to get the witness for.
138
178
  * @returns - The witness
139
- */ utilityGetPublicDataWitness(blockHash, leafSlot) {
140
- return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
179
+ */ getPublicDataWitness(blockHash, leafSlot) {
180
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
141
181
  }
142
182
  /**
143
183
  * Fetches a block header of a given block.
144
184
  * @param blockNumber - The number of a block of which to get the block header.
145
185
  * @returns Block extracted from a block with block number `blockNumber`.
146
- */ async utilityGetBlockHeader(blockNumber) {
186
+ */ async getBlockHeader(blockNumber) {
147
187
  const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
148
188
  if (blockNumber > anchorBlockNumber) {
149
189
  throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
@@ -152,11 +192,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
152
192
  return block?.header;
153
193
  }
154
194
  /**
155
- * Retrieve the complete address associated to a given address.
195
+ * Retrieve the public keys and partial address associated to a given address.
156
196
  * @param account - The account address.
157
- * @returns A complete address associated with the input address, or `undefined` if not registered.
158
- */ utilityTryGetPublicKeysAndPartialAddress(account) {
159
- return this.addressStore.getCompleteAddress(account);
197
+ * @returns The public keys and partial address, or `undefined` if the account is not registered.
198
+ */ async getPublicKeysAndPartialAddress(account) {
199
+ const completeAddress = await this.addressStore.getCompleteAddress(account);
200
+ if (!completeAddress) {
201
+ return undefined;
202
+ }
203
+ return {
204
+ publicKeys: completeAddress.publicKeys,
205
+ partialAddress: completeAddress.partialAddress
206
+ };
160
207
  }
161
208
  async getCompleteAddressOrFail(account) {
162
209
  const completeAddress = await this.addressStore.getCompleteAddress(account);
@@ -170,10 +217,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
170
217
  * Returns a contract instance associated with an address or throws if not found.
171
218
  * @param address - Address.
172
219
  * @returns A contract instance.
173
- */ utilityGetContractInstance(address) {
174
- return this.getContractInstance(address);
175
- }
176
- async getContractInstance(address) {
220
+ */ async getContractInstance(address) {
177
221
  const instance = await this.contractStore.getContractInstance(address);
178
222
  if (!instance) {
179
223
  throw new Error(`No contract instance found for address ${address.toString()}`);
@@ -181,11 +225,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
181
225
  return instance;
182
226
  }
183
227
  /**
184
- * Returns an auth witness for the given message hash. Checks on the list of transient witnesses
185
- * for this transaction first, and falls back to the local database if not found.
228
+ * Returns an auth witness for the given message hash from the list of transient witnesses for this transaction.
186
229
  * @param messageHash - Hash of the message to authenticate.
187
- * @returns Authentication witness for the requested message hash.
188
- */ utilityGetAuthWitness(messageHash) {
230
+ * @returns Authentication witness for the requested message hash, or undefined if not found.
231
+ */ getAuthWitness(messageHash) {
189
232
  return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
190
233
  }
191
234
  /**
@@ -209,7 +252,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
209
252
  * @param offset - The starting index for pagination.
210
253
  * @param status - The status of notes to fetch.
211
254
  * @returns Array of note data.
212
- */ async utilityGetNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
255
+ */ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
213
256
  const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
214
257
  const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
215
258
  return pickNotes(dbNotes, {
@@ -238,7 +281,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
238
281
  * Check if a nullifier exists in the nullifier tree.
239
282
  * @param innerNullifier - The inner nullifier.
240
283
  * @returns A boolean indicating whether the nullifier exists in the tree or not.
241
- */ async utilityCheckNullifierExists(innerNullifier) {
284
+ */ async doesNullifierExist(innerNullifier) {
242
285
  const [nullifier, anchorBlockHash] = await Promise.all([
243
286
  siloNullifier(this.contractAddress, innerNullifier),
244
287
  this.anchorBlockHeader.hash()
@@ -249,14 +292,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
249
292
  return leafIndex?.data !== undefined;
250
293
  }
251
294
  /**
252
- * Fetches a message from the executionStore, given its key.
295
+ * Returns the membership witness of an un-nullified L1 to L2 message.
253
296
  * @param contractAddress - Address of a contract by which the message was emitted.
254
297
  * @param messageHash - Hash of the message.
255
298
  * @param secret - Secret used to compute a nullifier.
256
299
  * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
257
300
  * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
258
- */ async utilityGetL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
259
- const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
301
+ */ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
302
+ const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
260
303
  return new MessageLoadOracleInputs(messageIndex, siblingPath);
261
304
  }
262
305
  /**
@@ -265,129 +308,252 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
265
308
  * @param contractAddress - The address to read storage from.
266
309
  * @param startStorageSlot - The starting storage slot.
267
310
  * @param numberOfElements - Number of elements to read from the starting storage slot.
268
- */ async utilityStorageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
269
- const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
270
- const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
271
- this.log.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
272
- return values;
311
+ */ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
312
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
313
+ const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
314
+ const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
315
+ this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
316
+ return values;
317
+ });
273
318
  }
274
319
  /**
275
- * Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
320
+ * Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
276
321
  */ async #getContractLogger() {
277
322
  if (!this.contractLogger) {
278
323
  // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
279
324
  // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
280
- this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
325
+ this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
281
326
  instanceId: this.jobId
282
327
  });
283
328
  }
284
329
  return this.contractLogger;
285
330
  }
286
- async utilityLog(level, message, fields) {
331
+ /**
332
+ * Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
333
+ */ async #getAztecnrLogger() {
334
+ if (!this.aztecnrLogger) {
335
+ // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
336
+ // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
337
+ this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
338
+ instanceId: this.jobId
339
+ });
340
+ }
341
+ return this.aztecnrLogger;
342
+ }
343
+ async log(level, message, fields) {
287
344
  if (!LogLevels[level]) {
288
345
  throw new Error(`Invalid log level: ${level}`);
289
346
  }
290
- const logger = await this.#getContractLogger();
291
- logContractMessage(logger, LogLevels[level], message, fields);
347
+ const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
348
+ const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
349
+ logContractMessage(logger, LogLevels[level], strippedMessage, fields);
292
350
  }
293
- async utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
294
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
295
- await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
351
+ // Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
352
+ async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
353
+ const logService = this.#createLogService();
354
+ const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
355
+ await this.capsuleService.appendToCapsuleArray(this.contractAddress, pendingTaggedLogArrayBaseSlot, logs.map((log)=>log.toFields()), this.jobId, scope);
356
+ }
357
+ /** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */ async getPendingTaggedLogsV2(scope) {
358
+ const logService = this.#createLogService();
359
+ const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
360
+ return this.ephemeralArrayService.newArray(logs.map((log)=>log.toFields()));
361
+ }
362
+ #createLogService() {
363
+ return new LogService(this.aztecNode, this.anchorBlockHeader, this.l2TipsStore, this.keyStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
296
364
  }
297
365
  /**
298
- * Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
299
- * `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
300
- * queryable via `get_notes` and `getPrivateEvents`.
366
+ * Legacy: validates note/event requests stored in capsule arrays.
301
367
  *
302
- * This automatically clears both validation request queues, so no further work needs to be done by the caller.
303
- * @param contractAddress - The address of the contract that the logs are tagged for.
304
- * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
305
- * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
306
- */ async utilityValidateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
368
+ * Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
369
+ */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
307
370
  // TODO(#10727): allow other contracts to store notes
308
371
  if (!this.contractAddress.equals(contractAddress)) {
309
372
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
310
373
  }
311
- // We read all note and event validation requests and process them all concurrently. This makes the process much
312
- // faster as we don't need to wait for the network round-trip.
313
- const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
314
- const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
374
+ const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
375
+ const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
376
+ await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
377
+ await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
378
+ await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
379
+ }
380
+ async validateAndStoreEnqueuedNotesAndEventsV2(noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
381
+ const noteValidationRequests = this.ephemeralArrayService.readArrayAt(noteValidationRequestsArrayBaseSlot).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
382
+ const eventValidationRequests = this.ephemeralArrayService.readArrayAt(eventValidationRequestsArrayBaseSlot).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
383
+ await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
384
+ }
385
+ /**
386
+ * Dispatches note and event validation requests to the service layer.
387
+ *
388
+ * This function is an auxiliary to support legacy (capsule backed) and new (ephemeral array backed) versions of the
389
+ * `validateAndStoreEnqueuedNotesAndEvents` oracle.
390
+ */ async #processValidationRequests(noteValidationRequests, eventValidationRequests, scope) {
315
391
  const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
316
- 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));
392
+ 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, scope));
317
393
  const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
318
- const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, request.recipient));
394
+ const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
319
395
  await Promise.all([
320
396
  ...noteStorePromises,
321
397
  ...eventStorePromises
322
398
  ]);
323
- // Requests are cleared once we're done.
324
- await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
325
- await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
326
399
  }
327
- async utilityBulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
400
+ async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
328
401
  // TODO(#10727): allow other contracts to process partial notes
329
402
  if (!this.contractAddress.equals(contractAddress)) {
330
403
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
331
404
  }
332
405
  // We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
333
406
  // don't need to wait for the network round-trip.
334
- const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
335
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
336
- const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
407
+ const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
408
+ const logService = this.#createLogService();
409
+ const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
337
410
  // Requests are cleared once we're done.
338
- await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
411
+ await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
339
412
  // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
340
- await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
413
+ await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
414
+ }
415
+ async getLogsByTagV2(requestArrayBaseSlot) {
416
+ const logRetrievalRequests = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot).map(LogRetrievalRequest.fromFields);
417
+ const logService = this.#createLogService();
418
+ const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
419
+ return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
420
+ }
421
+ // Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
422
+ async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
423
+ try {
424
+ if (!this.contractAddress.equals(contractAddress)) {
425
+ throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
426
+ }
427
+ // TODO(@mverzilli): this is a prime example of where using an ephemeral array would make much more sense, we don't
428
+ // need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
429
+ // At the same time, we don't want to allow any global scope access other than where backwards compatibility
430
+ // forces us to. Hence we need the scope here to be artificial.
431
+ const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
432
+ const txHashes = requestCapsules.map((fields, i)=>{
433
+ if (fields.length !== 1) {
434
+ throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
435
+ }
436
+ return fields[0];
437
+ });
438
+ const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
439
+ // Leave response in response capsule array.
440
+ await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
441
+ } finally{
442
+ await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
443
+ }
444
+ }
445
+ /** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */ async getMessageContextsByTxHashV2(requestArrayBaseSlot) {
446
+ const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
447
+ const txHashes = requestFields.map((fields, i)=>{
448
+ if (fields.length !== 1) {
449
+ throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
450
+ }
451
+ return fields[0];
452
+ });
453
+ const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
454
+ return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
341
455
  }
342
- utilityStoreCapsule(contractAddress, slot, capsule) {
456
+ setCapsule(contractAddress, slot, capsule, scope) {
343
457
  if (!contractAddress.equals(this.contractAddress)) {
344
458
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
345
459
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
346
460
  }
347
- this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
348
- return Promise.resolve();
461
+ this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
349
462
  }
350
- async utilityLoadCapsule(contractAddress, slot) {
463
+ getCapsule(contractAddress, slot, scope) {
351
464
  if (!contractAddress.equals(this.contractAddress)) {
352
465
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
353
466
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
354
467
  }
355
- return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
356
- this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
468
+ return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
357
469
  }
358
- utilityDeleteCapsule(contractAddress, slot) {
470
+ deleteCapsule(contractAddress, slot, scope) {
359
471
  if (!contractAddress.equals(this.contractAddress)) {
360
472
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
361
473
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
362
474
  }
363
- this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
364
- return Promise.resolve();
475
+ this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
365
476
  }
366
- utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
477
+ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
367
478
  if (!contractAddress.equals(this.contractAddress)) {
368
479
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
369
480
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
370
481
  }
371
- return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
482
+ return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
483
+ }
484
+ /**
485
+ * Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
486
+ * stored notes or events are discovered.
487
+ */ setContractSyncCacheInvalid(contractAddress, scopes) {
488
+ if (!contractAddress.equals(this.contractAddress)) {
489
+ throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
490
+ }
491
+ this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
372
492
  }
373
493
  // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
374
- utilityAes128Decrypt(ciphertext, iv, symKey) {
494
+ decryptAes128(ciphertext, iv, symKey) {
375
495
  const aes128 = new Aes128();
376
496
  return aes128.decryptBufferCBC(ciphertext, iv, symKey);
377
497
  }
378
498
  /**
379
- * Retrieves the shared secret for a given address and ephemeral public key.
499
+ * Retrieves the app-siloed shared secret for a given address and ephemeral public key.
380
500
  * @param address - The address to get the secret for.
381
501
  * @param ephPk - The ephemeral public key to get the secret for.
382
- * @returns The secret for the given address.
383
- */ utilityGetSharedSecret(address, ephPk) {
384
- return this.getSharedSecret(address, ephPk);
385
- }
386
- async getSharedSecret(address, ephPk) {
387
- // TODO(#12656): return an app-siloed secret
502
+ * @param contractAddress - The contract address for app-siloing (validated against execution context).
503
+ * @returns The app-siloed shared secret as a Field.
504
+ */ async getSharedSecret(address, ephPk, contractAddress) {
505
+ if (!contractAddress.equals(this.contractAddress)) {
506
+ throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
507
+ }
388
508
  const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
389
509
  const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
390
510
  const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
391
- return deriveEcdhSharedSecret(addressSecret, ephPk);
511
+ return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
512
+ }
513
+ pushEphemeral(slot, elements) {
514
+ return this.ephemeralArrayService.push(slot, elements);
515
+ }
516
+ popEphemeral(slot) {
517
+ return this.ephemeralArrayService.pop(slot);
518
+ }
519
+ getEphemeral(slot, index) {
520
+ return this.ephemeralArrayService.get(slot, index);
521
+ }
522
+ setEphemeral(slot, index, elements) {
523
+ this.ephemeralArrayService.set(slot, index, elements);
524
+ }
525
+ getEphemeralLen(slot) {
526
+ return this.ephemeralArrayService.len(slot);
527
+ }
528
+ removeEphemeral(slot, index) {
529
+ this.ephemeralArrayService.remove(slot, index);
530
+ }
531
+ clearEphemeral(slot) {
532
+ this.ephemeralArrayService.clear(slot);
533
+ }
534
+ emitOffchainEffect(data) {
535
+ this.offchainEffects.push({
536
+ data,
537
+ contractAddress: this.contractAddress
538
+ });
539
+ return Promise.resolve();
540
+ }
541
+ /** Returns offchain effects collected during execution. */ getOffchainEffects() {
542
+ return this.offchainEffects;
543
+ }
544
+ /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
545
+ const [response] = await Promise.all([
546
+ query(),
547
+ (async ()=>{
548
+ const header = await this.aztecNode.getBlockHeader(blockHash);
549
+ if (!header) {
550
+ throw new Error(`Could not find block header for block hash ${blockHash}`);
551
+ }
552
+ if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
553
+ 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()}).`);
554
+ }
555
+ })()
556
+ ]);
557
+ return response;
392
558
  }
393
559
  }
@@ -82,4 +82,4 @@ interface ContainsNote {
82
82
  */
83
83
  export declare function pickNotes<T extends ContainsNote>(noteDatas: T[], { selects, sorts, limit, offset }: GetOptions): T[];
84
84
  export {};
85
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGlja19ub3Rlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9waWNrX25vdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFNO0lBQ3JCOztPQUVHO0lBQ0gsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0lBQzNCOztPQUVHO0lBQ0gsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUNWOztPQUVHO0lBQ0gsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksU0FBUztJQUNuQixJQUFJLElBQUk7SUFDUixJQUFJLElBQUk7SUFDUixHQUFHLElBQUk7Q0FDUjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLElBQUk7SUFDbkI7O09BRUc7SUFDSCxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0I7O09BRUc7SUFDSCxLQUFLLEVBQUUsU0FBUyxDQUFDO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxVQUFVLFVBQVU7SUFDbEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkI7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDZjs7O09BR0c7SUFDSCxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZjs7O09BR0c7SUFDSCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakI7QUFFRDs7R0FFRztBQUNILFVBQVUsWUFBWTtJQUNwQjs7T0FFRztJQUNILElBQUksRUFBRSxJQUFJLENBQUM7Q0FDWjtBQThDRDs7R0FFRztBQUNILHdCQUFnQixTQUFTLENBQUMsQ0FBQyxTQUFTLFlBQVksRUFDOUMsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUNkLEVBQUUsT0FBWSxFQUFFLEtBQVUsRUFBRSxLQUFTLEVBQUUsTUFBVSxFQUFFLEVBQUUsVUFBVSxHQUM5RCxDQUFDLEVBQUUsQ0FJTCJ9
85
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGlja19ub3Rlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9waWNrX25vdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFNO0lBQ3JCOztPQUVHO0lBQ0gsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0lBQzNCOztPQUVHO0lBQ0gsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUNWOztPQUVHO0lBQ0gsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksU0FBUztJQUNuQixJQUFJLElBQUk7SUFDUixJQUFJLElBQUk7SUFDUixHQUFHLElBQUk7Q0FDUjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLElBQUk7SUFDbkI7O09BRUc7SUFDSCxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0I7O09BRUc7SUFDSCxLQUFLLEVBQUUsU0FBUyxDQUFDO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxVQUFVLFVBQVU7SUFDbEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkI7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDZjs7O09BR0c7SUFDSCxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZjs7O09BR0c7SUFDSCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakI7QUFFRDs7R0FFRztBQUNILFVBQVUsWUFBWTtJQUNwQjs7T0FFRztJQUNILElBQUksRUFBRSxJQUFJLENBQUM7Q0FDWjtBQWlFRDs7R0FFRztBQUNILHdCQUFnQixTQUFTLENBQUMsQ0FBQyxTQUFTLFlBQVksRUFDOUMsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUNkLEVBQUUsT0FBWSxFQUFFLEtBQVUsRUFBRSxLQUFTLEVBQUUsTUFBVSxFQUFFLEVBQUUsVUFBVSxHQUM5RCxDQUFDLEVBQUUsQ0FJTCJ9
@@ -1 +1 @@
1
- {"version":3,"file":"pick_notes.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/pick_notes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,GAAG,IAAI;CACR;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AA8CD;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,YAAY,EAC9C,SAAS,EAAE,CAAC,EAAE,EACd,EAAE,OAAY,EAAE,KAAU,EAAE,KAAS,EAAE,MAAU,EAAE,EAAE,UAAU,GAC9D,CAAC,EAAE,CAIL"}
1
+ {"version":3,"file":"pick_notes.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/pick_notes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,GAAG,IAAI;CACR;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AAiED;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,YAAY,EAC9C,SAAS,EAAE,CAAC,EAAE,EACd,EAAE,OAAY,EAAE,KAAU,EAAE,KAAS,EAAE,MAAU,EAAE,EAAE,UAAU,GAC9D,CAAC,EAAE,CAIL"}