@aztec/pxe 0.0.1-commit.64b6bbb → 0.0.1-commit.684755437

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 (155) 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/config/index.d.ts +2 -2
  5. package/dest/config/index.d.ts.map +1 -1
  6. package/dest/config/index.js +1 -1
  7. package/dest/config/package_info.js +1 -1
  8. package/dest/contract_function_simulator/contract_function_simulator.d.ts +8 -6
  9. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  10. package/dest/contract_function_simulator/contract_function_simulator.js +114 -44
  11. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +5 -5
  12. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  13. package/dest/contract_function_simulator/execution_tagging_index_cache.js +3 -3
  14. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +1 -1
  15. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +2 -2
  16. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  17. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +1 -1
  18. package/dest/contract_function_simulator/oracle/interfaces.d.ts +49 -45
  19. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  20. package/dest/contract_function_simulator/oracle/oracle.d.ts +44 -44
  21. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  22. package/dest/contract_function_simulator/oracle/oracle.js +132 -89
  23. package/dest/contract_function_simulator/oracle/private_execution.js +1 -1
  24. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +22 -21
  25. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  26. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +37 -37
  27. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +39 -36
  28. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  29. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +56 -53
  30. package/dest/contract_logging.d.ts +22 -0
  31. package/dest/contract_logging.d.ts.map +1 -0
  32. package/dest/contract_logging.js +23 -0
  33. package/dest/contract_sync/contract_sync_service.d.ts +4 -2
  34. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
  35. package/dest/contract_sync/contract_sync_service.js +34 -19
  36. package/dest/contract_sync/helpers.d.ts +3 -2
  37. package/dest/contract_sync/helpers.d.ts.map +1 -1
  38. package/dest/contract_sync/helpers.js +3 -3
  39. package/dest/debug/pxe_debug_utils.d.ts +5 -4
  40. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  41. package/dest/debug/pxe_debug_utils.js +4 -4
  42. package/dest/entrypoints/client/bundle/index.d.ts +4 -1
  43. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  44. package/dest/entrypoints/client/bundle/index.js +3 -0
  45. package/dest/entrypoints/client/lazy/index.d.ts +4 -1
  46. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  47. package/dest/entrypoints/client/lazy/index.js +3 -0
  48. package/dest/entrypoints/server/index.d.ts +3 -1
  49. package/dest/entrypoints/server/index.d.ts.map +1 -1
  50. package/dest/entrypoints/server/index.js +2 -0
  51. package/dest/logs/log_service.d.ts +3 -2
  52. package/dest/logs/log_service.d.ts.map +1 -1
  53. package/dest/logs/log_service.js +9 -14
  54. package/dest/notes/note_service.d.ts +4 -3
  55. package/dest/notes/note_service.d.ts.map +1 -1
  56. package/dest/notes/note_service.js +3 -2
  57. package/dest/notes_filter.d.ts +25 -0
  58. package/dest/notes_filter.d.ts.map +1 -0
  59. package/dest/notes_filter.js +4 -0
  60. package/dest/oracle_version.d.ts +2 -2
  61. package/dest/oracle_version.js +3 -3
  62. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
  63. package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
  64. package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
  65. package/dest/private_kernel/hints/index.d.ts +1 -1
  66. package/dest/private_kernel/hints/index.js +1 -1
  67. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
  68. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
  69. package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
  70. package/dest/private_kernel/hints/test_utils.d.ts +122 -0
  71. package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
  72. package/dest/private_kernel/hints/test_utils.js +203 -0
  73. package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
  74. package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
  75. package/dest/private_kernel/private_kernel_execution_prover.js +19 -11
  76. package/dest/private_kernel/private_kernel_oracle.d.ts +6 -2
  77. package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
  78. package/dest/private_kernel/private_kernel_oracle.js +7 -3
  79. package/dest/pxe.d.ts +18 -13
  80. package/dest/pxe.d.ts.map +1 -1
  81. package/dest/pxe.js +48 -37
  82. package/dest/storage/contract_store/contract_store.d.ts +42 -15
  83. package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
  84. package/dest/storage/contract_store/contract_store.js +140 -64
  85. package/dest/storage/note_store/note_store.d.ts +3 -3
  86. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  87. package/dest/storage/note_store/note_store.js +3 -4
  88. package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
  89. package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
  90. package/dest/storage/tagging_store/sender_tagging_store.d.ts +5 -5
  91. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  92. package/dest/storage/tagging_store/sender_tagging_store.js +4 -4
  93. package/dest/tagging/get_all_logs_by_tags.d.ts +1 -1
  94. package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
  95. package/dest/tagging/get_all_logs_by_tags.js +17 -3
  96. package/dest/tagging/index.d.ts +2 -2
  97. package/dest/tagging/index.d.ts.map +1 -1
  98. package/dest/tagging/index.js +1 -1
  99. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +4 -5
  100. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
  101. package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +7 -7
  102. package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
  103. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
  104. package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
  105. package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
  106. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
  107. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  108. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +3 -6
  109. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +4 -7
  110. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  111. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +14 -15
  112. package/package.json +16 -16
  113. package/src/access_scopes.ts +9 -0
  114. package/src/config/index.ts +1 -1
  115. package/src/config/package_info.ts +1 -1
  116. package/src/contract_function_simulator/contract_function_simulator.ts +220 -63
  117. package/src/contract_function_simulator/execution_tagging_index_cache.ts +5 -5
  118. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +1 -1
  119. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +1 -1
  120. package/src/contract_function_simulator/oracle/interfaces.ts +47 -44
  121. package/src/contract_function_simulator/oracle/oracle.ts +135 -107
  122. package/src/contract_function_simulator/oracle/private_execution.ts +1 -1
  123. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +44 -39
  124. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +64 -64
  125. package/src/contract_logging.ts +39 -0
  126. package/src/contract_sync/contract_sync_service.ts +49 -26
  127. package/src/contract_sync/helpers.ts +7 -2
  128. package/src/debug/pxe_debug_utils.ts +11 -9
  129. package/src/entrypoints/client/bundle/index.ts +3 -0
  130. package/src/entrypoints/client/lazy/index.ts +3 -0
  131. package/src/entrypoints/server/index.ts +2 -0
  132. package/src/logs/log_service.ts +17 -24
  133. package/src/notes/note_service.ts +4 -3
  134. package/src/notes_filter.ts +26 -0
  135. package/src/oracle_version.ts +3 -3
  136. package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
  137. package/src/private_kernel/hints/index.ts +1 -1
  138. package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
  139. package/src/private_kernel/hints/test_utils.ts +325 -0
  140. package/src/private_kernel/private_kernel_execution_prover.ts +19 -12
  141. package/src/private_kernel/private_kernel_oracle.ts +7 -7
  142. package/src/pxe.ts +67 -54
  143. package/src/storage/contract_store/contract_store.ts +170 -71
  144. package/src/storage/note_store/note_store.ts +8 -5
  145. package/src/storage/tagging_store/recipient_tagging_store.ts +9 -5
  146. package/src/storage/tagging_store/sender_tagging_store.ts +8 -8
  147. package/src/tagging/get_all_logs_by_tags.ts +28 -4
  148. package/src/tagging/index.ts +1 -1
  149. package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +7 -10
  150. package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
  151. package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
  152. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +4 -9
  153. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +11 -20
  154. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
  155. package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
@@ -1,11 +1,12 @@
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
4
  import { siloNullifier } from '@aztec/stdlib/hash';
5
5
  import { computeAddressSecret } from '@aztec/stdlib/keys';
6
6
  import { deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
7
7
  import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
8
8
  import { MerkleTreeId } from '@aztec/stdlib/trees';
9
+ import { createContractLogger, logContractMessage } from '../../contract_logging.js';
9
10
  import { EventService } from '../../events/event_service.js';
10
11
  import { LogService } from '../../logs/log_service.js';
11
12
  import { NoteService } from '../../notes/note_service.js';
@@ -37,7 +38,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
37
38
  capsuleStore;
38
39
  privateEventStore;
39
40
  jobId;
40
- log;
41
+ logger;
41
42
  scopes;
42
43
  constructor(args){
43
44
  this.contractAddress = args.contractAddress;
@@ -54,18 +55,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
54
55
  this.capsuleStore = args.capsuleStore;
55
56
  this.privateEventStore = args.privateEventStore;
56
57
  this.jobId = args.jobId;
57
- this.log = args.log ?? createLogger('simulator:client_view_context');
58
+ this.logger = args.log ?? createLogger('simulator:client_view_context');
58
59
  this.scopes = args.scopes;
59
60
  }
60
- utilityAssertCompatibleOracleVersion(version) {
61
+ assertCompatibleOracleVersion(version) {
61
62
  if (version !== ORACLE_VERSION) {
62
63
  throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
63
64
  }
64
65
  }
65
- utilityGetRandomField() {
66
+ getRandomField() {
66
67
  return Fr.random();
67
68
  }
68
- utilityGetUtilityContext() {
69
+ getUtilityContext() {
69
70
  return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
70
71
  }
71
72
  /**
@@ -74,12 +75,17 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
74
75
  * @returns A Promise that resolves to nullifier keys.
75
76
  * @throws If the keys are not registered in the key store.
76
77
  * @throws If scopes are defined and the account is not in the scopes.
77
- */ async utilityGetKeyValidationRequest(pkMHash) {
78
- // If scopes are defined, check that the key belongs to an account in the scopes
79
- if (this.scopes && this.scopes.length > 0) {
80
- const [, account] = await this.keyStore.getKeyPrefixAndAccount(pkMHash);
81
- if (!this.scopes.some((scope)=>scope.equals(account))) {
82
- throw new Error(`Key validation request denied: account ${account.toString()} is not in the allowed scopes.`);
78
+ */ async getKeyValidationRequest(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()}.`);
83
89
  }
84
90
  }
85
91
  return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
@@ -90,7 +96,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
90
96
  * witness.
91
97
  * @param noteHash - The note hash to find in the note hash tree.
92
98
  * @returns The membership witness containing the leaf index and sibling path
93
- */ utilityGetNoteHashMembershipWitness(anchorBlockHash, noteHash) {
99
+ */ getNoteHashMembershipWitness(anchorBlockHash, noteHash) {
94
100
  return this.aztecNode.getNoteHashMembershipWitness(anchorBlockHash, noteHash);
95
101
  }
96
102
  /**
@@ -103,7 +109,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
103
109
  * witness.
104
110
  * @param blockHash - The block hash to find in the archive tree.
105
111
  * @returns The membership witness containing the leaf index and sibling path
106
- */ utilityGetBlockHashMembershipWitness(anchorBlockHash, blockHash) {
112
+ */ getBlockHashMembershipWitness(anchorBlockHash, blockHash) {
107
113
  return this.aztecNode.getBlockHashMembershipWitness(anchorBlockHash, blockHash);
108
114
  }
109
115
  /**
@@ -111,7 +117,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
111
117
  * @param blockHash - The block hash at which to get the index.
112
118
  * @param nullifier - Nullifier we try to find witness for.
113
119
  * @returns The nullifier membership witness (if found).
114
- */ utilityGetNullifierMembershipWitness(blockHash, nullifier) {
120
+ */ getNullifierMembershipWitness(blockHash, nullifier) {
115
121
  return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
116
122
  }
117
123
  /**
@@ -122,7 +128,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
122
128
  * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
123
129
  * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
124
130
  * we are trying to prove non-inclusion for.
125
- */ utilityGetLowNullifierMembershipWitness(blockHash, nullifier) {
131
+ */ getLowNullifierMembershipWitness(blockHash, nullifier) {
126
132
  return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
127
133
  }
128
134
  /**
@@ -130,14 +136,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
130
136
  * @param blockHash - The block hash at which to get the index.
131
137
  * @param leafSlot - The slot of the public data tree to get the witness for.
132
138
  * @returns - The witness
133
- */ utilityGetPublicDataWitness(blockHash, leafSlot) {
139
+ */ getPublicDataWitness(blockHash, leafSlot) {
134
140
  return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
135
141
  }
136
142
  /**
137
143
  * Fetches a block header of a given block.
138
144
  * @param blockNumber - The number of a block of which to get the block header.
139
145
  * @returns Block extracted from a block with block number `blockNumber`.
140
- */ async utilityGetBlockHeader(blockNumber) {
146
+ */ async getBlockHeader(blockNumber) {
141
147
  const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
142
148
  if (blockNumber > anchorBlockNumber) {
143
149
  throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
@@ -146,11 +152,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
146
152
  return block?.header;
147
153
  }
148
154
  /**
149
- * Retrieve the complete address associated to a given address.
155
+ * Retrieve the public keys and partial address associated to a given address.
150
156
  * @param account - The account address.
151
- * @returns A complete address associated with the input address, or `undefined` if not registered.
152
- */ utilityTryGetPublicKeysAndPartialAddress(account) {
153
- return this.addressStore.getCompleteAddress(account);
157
+ * @returns The public keys and partial address, or `undefined` if the account is not registered.
158
+ */ async tryGetPublicKeysAndPartialAddress(account) {
159
+ const completeAddress = await this.addressStore.getCompleteAddress(account);
160
+ if (!completeAddress) {
161
+ return undefined;
162
+ }
163
+ return {
164
+ publicKeys: completeAddress.publicKeys,
165
+ partialAddress: completeAddress.partialAddress
166
+ };
154
167
  }
155
168
  async getCompleteAddressOrFail(account) {
156
169
  const completeAddress = await this.addressStore.getCompleteAddress(account);
@@ -164,10 +177,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
164
177
  * Returns a contract instance associated with an address or throws if not found.
165
178
  * @param address - Address.
166
179
  * @returns A contract instance.
167
- */ utilityGetContractInstance(address) {
168
- return this.getContractInstance(address);
169
- }
170
- async getContractInstance(address) {
180
+ */ async getContractInstance(address) {
171
181
  const instance = await this.contractStore.getContractInstance(address);
172
182
  if (!instance) {
173
183
  throw new Error(`No contract instance found for address ${address.toString()}`);
@@ -179,7 +189,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
179
189
  * for this transaction first, and falls back to the local database if not found.
180
190
  * @param messageHash - Hash of the message to authenticate.
181
191
  * @returns Authentication witness for the requested message hash.
182
- */ utilityGetAuthWitness(messageHash) {
192
+ */ getAuthWitness(messageHash) {
183
193
  return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
184
194
  }
185
195
  /**
@@ -203,7 +213,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
203
213
  * @param offset - The starting index for pagination.
204
214
  * @param status - The status of notes to fetch.
205
215
  * @returns Array of note data.
206
- */ async utilityGetNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
216
+ */ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
207
217
  const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
208
218
  const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
209
219
  return pickNotes(dbNotes, {
@@ -232,7 +242,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
232
242
  * Check if a nullifier exists in the nullifier tree.
233
243
  * @param innerNullifier - The inner nullifier.
234
244
  * @returns A boolean indicating whether the nullifier exists in the tree or not.
235
- */ async utilityCheckNullifierExists(innerNullifier) {
245
+ */ async checkNullifierExists(innerNullifier) {
236
246
  const [nullifier, anchorBlockHash] = await Promise.all([
237
247
  siloNullifier(this.contractAddress, innerNullifier),
238
248
  this.anchorBlockHeader.hash()
@@ -249,7 +259,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
249
259
  * @param secret - Secret used to compute a nullifier.
250
260
  * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
251
261
  * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
252
- */ async utilityGetL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
262
+ */ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
253
263
  const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
254
264
  return new MessageLoadOracleInputs(messageIndex, siblingPath);
255
265
  }
@@ -259,37 +269,33 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
259
269
  * @param contractAddress - The address to read storage from.
260
270
  * @param startStorageSlot - The starting storage slot.
261
271
  * @param numberOfElements - Number of elements to read from the starting storage slot.
262
- */ async utilityStorageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
272
+ */ async storageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
263
273
  const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
264
274
  const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
265
- this.log.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
275
+ this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
266
276
  return values;
267
277
  }
268
278
  /**
269
279
  * Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
270
280
  */ async #getContractLogger() {
271
281
  if (!this.contractLogger) {
272
- const addrAbbrev = this.contractAddress.toString().slice(0, 10);
273
- const name = await this.contractStore.getDebugContractName(this.contractAddress);
274
- const module = name ? `contract_log::${name}(${addrAbbrev})` : `contract_log::${addrAbbrev}`;
275
282
  // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
276
283
  // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
277
- this.contractLogger = createLogger(module, {
284
+ this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
278
285
  instanceId: this.jobId
279
286
  });
280
287
  }
281
288
  return this.contractLogger;
282
289
  }
283
- async utilityLog(level, message, fields) {
290
+ async log(level, message, fields) {
284
291
  if (!LogLevels[level]) {
285
292
  throw new Error(`Invalid log level: ${level}`);
286
293
  }
287
- const levelName = LogLevels[level];
288
294
  const logger = await this.#getContractLogger();
289
- logger[levelName](`${applyStringFormatting(message, fields)}`);
295
+ logContractMessage(logger, LogLevels[level], message, fields);
290
296
  }
291
- async utilityFetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
292
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
297
+ async fetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
298
+ const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
293
299
  await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
294
300
  }
295
301
  /**
@@ -301,7 +307,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
301
307
  * @param contractAddress - The address of the contract that the logs are tagged for.
302
308
  * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
303
309
  * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
304
- */ async utilityValidateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
310
+ */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
305
311
  // TODO(#10727): allow other contracts to store notes
306
312
  if (!this.contractAddress.equals(contractAddress)) {
307
313
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
@@ -322,7 +328,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
322
328
  await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
323
329
  await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
324
330
  }
325
- async utilityBulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
331
+ async bulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
326
332
  // TODO(#10727): allow other contracts to process partial notes
327
333
  if (!this.contractAddress.equals(contractAddress)) {
328
334
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
@@ -330,14 +336,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
330
336
  // We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
331
337
  // don't need to wait for the network round-trip.
332
338
  const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
333
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.log.getBindings());
339
+ const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
334
340
  const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
335
341
  // Requests are cleared once we're done.
336
342
  await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
337
343
  // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
338
344
  await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
339
345
  }
340
- utilityStoreCapsule(contractAddress, slot, capsule) {
346
+ storeCapsule(contractAddress, slot, capsule) {
341
347
  if (!contractAddress.equals(this.contractAddress)) {
342
348
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
343
349
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -345,7 +351,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
345
351
  this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
346
352
  return Promise.resolve();
347
353
  }
348
- async utilityLoadCapsule(contractAddress, slot) {
354
+ async loadCapsule(contractAddress, slot) {
349
355
  if (!contractAddress.equals(this.contractAddress)) {
350
356
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
351
357
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -353,7 +359,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
353
359
  return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
354
360
  this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
355
361
  }
356
- utilityDeleteCapsule(contractAddress, slot) {
362
+ deleteCapsule(contractAddress, slot) {
357
363
  if (!contractAddress.equals(this.contractAddress)) {
358
364
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
359
365
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -361,7 +367,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
361
367
  this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
362
368
  return Promise.resolve();
363
369
  }
364
- utilityCopyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
370
+ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
365
371
  if (!contractAddress.equals(this.contractAddress)) {
366
372
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
367
373
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
@@ -369,7 +375,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
369
375
  return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
370
376
  }
371
377
  // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
372
- utilityAes128Decrypt(ciphertext, iv, symKey) {
378
+ aes128Decrypt(ciphertext, iv, symKey) {
373
379
  const aes128 = new Aes128();
374
380
  return aes128.decryptBufferCBC(ciphertext, iv, symKey);
375
381
  }
@@ -378,10 +384,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
378
384
  * @param address - The address to get the secret for.
379
385
  * @param ephPk - The ephemeral public key to get the secret for.
380
386
  * @returns The secret for the given address.
381
- */ utilityGetSharedSecret(address, ephPk) {
382
- return this.getSharedSecret(address, ephPk);
383
- }
384
- async getSharedSecret(address, ephPk) {
387
+ */ async getSharedSecret(address, ephPk) {
385
388
  // TODO(#12656): return an app-siloed secret
386
389
  const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
387
390
  const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
@@ -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
+ }
@@ -3,6 +3,7 @@ import type { FunctionCall, FunctionSelector } from '@aztec/stdlib/abi';
3
3
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
4
  import type { AztecNode } from '@aztec/stdlib/interfaces/client';
5
5
  import type { BlockHeader } from '@aztec/stdlib/tx';
6
+ import type { AccessScopes } from '../access_scopes.js';
6
7
  import type { StagedStore } from '../job_coordinator/job_coordinator.js';
7
8
  import type { ContractStore } from '../storage/contract_store/contract_store.js';
8
9
  import type { NoteStore } from '../storage/note_store/note_store.js';
@@ -31,11 +32,12 @@ export declare class ContractSyncService implements StagedStore {
31
32
  * @param functionToInvokeAfterSync - The function selector that will be called after sync (used to validate it's
32
33
  * not sync_state itself).
33
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).
34
36
  */
35
- ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string): Promise<void>;
37
+ ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall, scopes: AccessScopes) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string, scopes: AccessScopes): Promise<void>;
36
38
  /** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
37
39
  wipe(): void;
38
40
  commit(jobId: string): Promise<void>;
39
41
  discardStaged(jobId: string): Promise<void>;
40
42
  }
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVduRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsR0FBRztJQWJiLFFBQVEsQ0FBQyxTQUFTLG1CQUFtQjtJQUlyQyxPQUFPLENBQUMsZUFBZSxDQUF5QztJQUdoRSxPQUFPLENBQUMsbUJBQW1CLENBQXVDO0lBRWxFLFlBQ1UsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsR0FBRyxFQUFFLE1BQU0sRUFDakI7SUFFSiw0RUFBNEU7SUFDNUUsc0JBQXNCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FFbEU7SUFFRDs7Ozs7OztPQU9HO0lBQ0csb0JBQW9CLENBQ3hCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQ3JELGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsSUFBSSxDQUFDLENBOEJmO0lBMEJELGdGQUFnRjtJQUNoRixJQUFJLElBQUksSUFBSSxDQUdYO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUluQztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNMUM7Q0FDRiJ9
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsR0FBRztJQWRiLFFBQVEsQ0FBQyxTQUFTLG1CQUFtQjtJQUtyQyxPQUFPLENBQUMsZUFBZSxDQUF5QztJQUdoRSxPQUFPLENBQUMsbUJBQW1CLENBQXVDO0lBRWxFLFlBQ1UsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsR0FBRyxFQUFFLE1BQU0sRUFDakI7SUFFSiw0RUFBNEU7SUFDNUUsc0JBQXNCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FFbEU7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixlQUFlLEVBQUUsWUFBWSxFQUM3Qix5QkFBeUIsRUFBRSxnQkFBZ0IsR0FBRyxJQUFJLEVBQ2xELGVBQWUsRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQzNFLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDYixNQUFNLEVBQUUsWUFBWSxHQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBdUNmO0lBNEJELGdGQUFnRjtJQUNoRixJQUFJLElBQUksSUFBSSxDQUdYO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUluQztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNMUM7Q0FDRiJ9
@@ -1 +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,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;;IAWnD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,GAAG;IAbb,QAAQ,CAAC,SAAS,mBAAmB;IAIrC,OAAO,CAAC,eAAe,CAAyC;IAGhE,OAAO,CAAC,mBAAmB,CAAuC;IAElE,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAElE;IAED;;;;;;;OAOG;IACG,oBAAoB,CACxB,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EACrD,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CA8Bf;IA0BD,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;CACF"}
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,mBAAmB,CAAuC;IAElE,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAElE;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,CAuCf;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;CACF"}
@@ -10,8 +10,9 @@ import { syncState, verifyCurrentClassId } from './helpers.js';
10
10
  noteStore;
11
11
  log;
12
12
  storeName;
13
- // Tracks contracts synced since last wipe. Key is contract address string, value is a promise that resolves when
14
- // the contract is synced.
13
+ // Tracks contracts synced since last wipe. The cache is keyed per individual scope address
14
+ // (`contractAddress:scopeAddress`), or `contractAddress:*` for undefined scopes (all accounts).
15
+ // The value is a promise that resolves when the contract is synced.
15
16
  syncedContracts;
16
17
  // Per-job overridden contract addresses - these contracts should not be synced.
17
18
  overriddenContracts;
@@ -34,31 +35,37 @@ import { syncState, verifyCurrentClassId } from './helpers.js';
34
35
  * @param functionToInvokeAfterSync - The function selector that will be called after sync (used to validate it's
35
36
  * not sync_state itself).
36
37
  * @param utilityExecutor - Executor function for running the sync_state utility function.
37
- */ async ensureContractSynced(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId) {
38
- const key = contractAddress.toString();
39
- // Skip sync if this contract has an override for this job
38
+ * @param scopes - Access scopes to pass through to the utility executor (affects whose account's private state is discovered).
39
+ */ async ensureContractSynced(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId, scopes) {
40
+ // Skip sync if this contract has an override for this job (overrides are keyed by contract address only)
40
41
  const overrides = this.overriddenContracts.get(jobId);
41
- if (overrides?.has(key)) {
42
+ if (overrides?.has(contractAddress.toString())) {
42
43
  return;
43
44
  }
44
- const existing = this.syncedContracts.get(key);
45
- if (existing) {
46
- return existing;
45
+ // Skip sync if we already synced for "all scopes", or if we have an empty list of scopes
46
+ const allScopesKey = toKey(contractAddress, 'ALL_SCOPES');
47
+ const allScopesExisting = this.syncedContracts.get(allScopesKey);
48
+ if (allScopesExisting || scopes !== 'ALL_SCOPES' && scopes.length == 0) {
49
+ return;
47
50
  }
48
- const syncPromise = this.#doSync(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId);
49
- this.syncedContracts.set(key, syncPromise);
50
- try {
51
- await syncPromise;
52
- } catch (err) {
53
- // There was an error syncing the contract, so we remove it from the cache so that it can be retried.
54
- this.syncedContracts.delete(key);
55
- throw err;
51
+ const unsyncedScopes = scopes === 'ALL_SCOPES' ? scopes : scopes.filter((scope)=>!this.syncedContracts.has(toKey(contractAddress, scope)));
52
+ const unsyncedScopesKeys = toKeys(contractAddress, unsyncedScopes);
53
+ if (unsyncedScopesKeys.length > 0) {
54
+ // Start sync and store the promise for all unsynced scopes
55
+ const promise = this.#doSync(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId, unsyncedScopes).catch((err)=>{
56
+ // There was an error syncing the contract, so we remove it from the cache so that it can be retried.
57
+ unsyncedScopesKeys.forEach((key)=>this.syncedContracts.delete(key));
58
+ throw err;
59
+ });
60
+ unsyncedScopesKeys.forEach((key)=>this.syncedContracts.set(key, promise));
56
61
  }
62
+ const promises = toKeys(contractAddress, scopes).map((key)=>this.syncedContracts.get(key));
63
+ await Promise.all(promises);
57
64
  }
58
- async #doSync(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId) {
65
+ async #doSync(contractAddress, functionToInvokeAfterSync, utilityExecutor, anchorBlockHeader, jobId, scopes) {
59
66
  this.log.debug(`Syncing contract ${contractAddress}`);
60
67
  await Promise.all([
61
- syncState(contractAddress, this.contractStore, functionToInvokeAfterSync, utilityExecutor, this.noteStore, this.aztecNode, anchorBlockHeader, jobId),
68
+ syncState(contractAddress, this.contractStore, functionToInvokeAfterSync, utilityExecutor, this.noteStore, this.aztecNode, anchorBlockHeader, jobId, scopes),
62
69
  verifyCurrentClassId(contractAddress, this.aztecNode, this.contractStore, anchorBlockHeader)
63
70
  ]);
64
71
  this.log.debug(`Contract ${contractAddress} synced`);
@@ -80,3 +87,11 @@ import { syncState, verifyCurrentClassId } from './helpers.js';
80
87
  return Promise.resolve();
81
88
  }
82
89
  }
90
+ function toKeys(contract, scopes) {
91
+ return scopes === 'ALL_SCOPES' ? [
92
+ toKey(contract, scopes)
93
+ ] : scopes.map((scope)=>toKey(contract, scope));
94
+ }
95
+ function toKey(contract, scope) {
96
+ return scope === 'ALL_SCOPES' ? `${contract.toString()}:*` : `${contract.toString()}:${scope.toString()}`;
97
+ }
@@ -3,6 +3,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
3
3
  import type { ContractInstance } from '@aztec/stdlib/contract';
4
4
  import type { AztecNode } from '@aztec/stdlib/interfaces/client';
5
5
  import type { BlockHeader } from '@aztec/stdlib/tx';
6
+ import type { AccessScopes } from '../access_scopes.js';
6
7
  import type { ContractStore } from '../storage/contract_store/contract_store.js';
7
8
  import type { NoteStore } from '../storage/note_store/note_store.js';
8
9
  /**
@@ -15,7 +16,7 @@ import type { NoteStore } from '../storage/note_store/note_store.js';
15
16
  * @returns The current class id.
16
17
  */
17
18
  export declare function readCurrentClassId(contractAddress: AztecAddress, instance: ContractInstance, aztecNode: AztecNode, header: BlockHeader): Promise<import("@aztec/foundation/schemas").Fr>;
18
- export declare function syncState(contractAddress: AztecAddress, contractStore: ContractStore, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (privateSyncCall: FunctionCall) => Promise<any>, noteStore: NoteStore, aztecNode: AztecNode, anchorBlockHeader: BlockHeader, jobId: string): Promise<void>;
19
+ export declare function syncState(contractAddress: AztecAddress, contractStore: ContractStore, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (privateSyncCall: FunctionCall, scopes: AccessScopes) => Promise<any>, noteStore: NoteStore, aztecNode: AztecNode, anchorBlockHeader: BlockHeader, jobId: string, scopes: AccessScopes): Promise<void>;
19
20
  /**
20
21
  * Verify that the current class id of a contract obtained from AztecNode is the same as the one in contract data
21
22
  * provider (i.e. PXE's own storage).
@@ -25,4 +26,4 @@ export declare function syncState(contractAddress: AztecAddress, contractStore:
25
26
  * @param header - The header of the block at which to verify the current class id.
26
27
  */
27
28
  export declare function verifyCurrentClassId(contractAddress: AztecAddress, aztecNode: AztecNode, contractStore: ContractStore, header: BlockHeader): Promise<void>;
28
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X3N5bmMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJFOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUN0QyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxXQUFXLG1EQWFwQjtBQUVELHdCQUFzQixTQUFTLENBQzdCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsZUFBZSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQ2hFLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0saUJBaUJkO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixvQkFBb0IsQ0FDeEMsZUFBZSxFQUFFLFlBQVksRUFDN0IsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsTUFBTSxFQUFFLFdBQVcsaUJBYXBCIn0=
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X3N5bmMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXhELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLDZDQUE2QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXJFOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUN0QyxlQUFlLEVBQUUsWUFBWSxFQUM3QixRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxXQUFXLG1EQWFwQjtBQUVELHdCQUFzQixTQUFTLENBQzdCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFDdEYsU0FBUyxFQUFFLFNBQVMsRUFDcEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsaUJBQWlCLEVBQUUsV0FBVyxFQUM5QixLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxZQUFZLGlCQW9CckI7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQXNCLG9CQUFvQixDQUN4QyxlQUFlLEVBQUUsWUFBWSxFQUM3QixTQUFTLEVBQUUsU0FBUyxFQUNwQixhQUFhLEVBQUUsYUFBYSxFQUM1QixNQUFNLEVBQUUsV0FBVyxpQkFhcEIifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/contract_sync/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,mDAapB;AAED,wBAAsB,SAAS,CAC7B,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EAChE,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,iBAiBd;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,WAAW,iBAapB"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/contract_sync/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,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;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,mDAapB;AAED,wBAAsB,SAAS,CAC7B,eAAe,EAAE,YAAY,EAC7B,aAAa,EAAE,aAAa,EAC5B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EACtF,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,iBAoBrB;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,WAAW,iBAapB"}
@@ -20,7 +20,7 @@ import { NoteService } from '../notes/note_service.js';
20
20
  }
21
21
  return currentClassId;
22
22
  }
23
- export async function syncState(contractAddress, contractStore, functionToInvokeAfterSync, utilityExecutor, noteStore, aztecNode, anchorBlockHeader, jobId) {
23
+ export async function syncState(contractAddress, contractStore, functionToInvokeAfterSync, utilityExecutor, noteStore, aztecNode, anchorBlockHeader, jobId, scopes) {
24
24
  // Protocol contracts don't have private state to sync
25
25
  if (!isProtocolContract(contractAddress)) {
26
26
  const syncStateFunctionCall = await contractStore.getFunctionCall('sync_state', [], contractAddress);
@@ -31,8 +31,8 @@ export async function syncState(contractAddress, contractStore, functionToInvoke
31
31
  // Both sync_state and syncNoteNullifiers interact with the note store, but running them in parallel is safe
32
32
  // because note store is designed to handle concurrent operations.
33
33
  await Promise.all([
34
- utilityExecutor(syncStateFunctionCall),
35
- noteService.syncNoteNullifiers(contractAddress)
34
+ utilityExecutor(syncStateFunctionCall, scopes),
35
+ noteService.syncNoteNullifiers(contractAddress, scopes)
36
36
  ]);
37
37
  }
38
38
  }
@@ -1,11 +1,12 @@
1
1
  import type { FunctionCall } from '@aztec/stdlib/abi';
2
2
  import type { AuthWitness } from '@aztec/stdlib/auth-witness';
3
- import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
- import type { NoteDao, NotesFilter } from '@aztec/stdlib/note';
3
+ import type { NoteDao } from '@aztec/stdlib/note';
5
4
  import type { ContractOverrides } from '@aztec/stdlib/tx';
5
+ import type { AccessScopes } from '../access_scopes.js';
6
6
  import type { BlockSynchronizer } from '../block_synchronizer/block_synchronizer.js';
7
7
  import type { ContractFunctionSimulator } from '../contract_function_simulator/contract_function_simulator.js';
8
8
  import type { ContractSyncService } from '../contract_sync/contract_sync_service.js';
9
+ import type { NotesFilter } from '../notes_filter.js';
9
10
  import type { AnchorBlockStore } from '../storage/index.js';
10
11
  import type { NoteStore } from '../storage/note_store/note_store.js';
11
12
  /**
@@ -22,7 +23,7 @@ export declare class PXEDebugUtils {
22
23
  /** Not injected through constructor since they're are co-dependant */
23
24
  setPXEHelpers(putJobInQueue: <T>(job: (jobId: string) => Promise<T>) => Promise<T>, getSimulatorForTx: (overrides?: {
24
25
  contracts?: ContractOverrides;
25
- }) => ContractFunctionSimulator, simulateUtility: (contractFunctionSimulator: ContractFunctionSimulator, call: FunctionCall, authWitnesses: AuthWitness[] | undefined, scopes: AztecAddress[] | undefined, jobId: string) => Promise<any>): void;
26
+ }) => ContractFunctionSimulator, executeUtility: (contractFunctionSimulator: ContractFunctionSimulator, call: FunctionCall, authWitnesses: AuthWitness[] | undefined, scopes: AccessScopes, jobId: string) => Promise<any>): void;
26
27
  /**
27
28
  * A debugging utility to get notes based on the provided filter.
28
29
  *
@@ -41,4 +42,4 @@ export declare class PXEDebugUtils {
41
42
  */
42
43
  sync(): Promise<void>;
43
44
  }
44
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2RlYnVnX3V0aWxzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVidWcvcHhlX2RlYnVnX3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDckYsT0FBTyxLQUFLLEVBQUUseUJBQXlCLEVBQUUsTUFBTSwrREFBK0QsQ0FBQztBQUMvRyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFckU7OztHQUdHO0FBQ0gscUJBQWEsYUFBYTs7SUFZdEIsT0FBTyxDQUFDLG1CQUFtQjtJQUMzQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsc0JBQXNCO0lBQzlCLE9BQU8sQ0FBQyxnQkFBZ0I7SUFKMUIsWUFDVSxtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsU0FBUyxFQUFFLFNBQVMsRUFDcEIsc0JBQXNCLEVBQUUsaUJBQWlCLEVBQ3pDLGdCQUFnQixFQUFFLGdCQUFnQixFQUN4QztJQUVKLHNFQUFzRTtJQUMvRCxhQUFhLENBQ2xCLGFBQWEsRUFBRSxDQUFDLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQ3BFLGlCQUFpQixFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFBRSxTQUFTLENBQUMsRUFBRSxpQkFBaUIsQ0FBQTtLQUFFLEtBQUsseUJBQXlCLEVBQy9GLGVBQWUsRUFBRSxDQUNmLHlCQUF5QixFQUFFLHlCQUF5QixFQUNwRCxJQUFJLEVBQUUsWUFBWSxFQUNsQixhQUFhLEVBQUUsV0FBVyxFQUFFLEdBQUcsU0FBUyxFQUN4QyxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsU0FBUyxFQUNsQyxLQUFLLEVBQUUsTUFBTSxLQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFLbEI7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0ksUUFBUSxDQUFDLE1BQU0sRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBbUJ2RDtJQUVEOzs7T0FHRztJQUNJLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBRTNCO0NBQ0YifQ==
45
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlX2RlYnVnX3V0aWxzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGVidWcvcHhlX2RlYnVnX3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxNQUFNLCtEQUErRCxDQUFDO0FBQy9HLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDckYsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUVyRTs7O0dBR0c7QUFDSCxxQkFBYSxhQUFhOztJQVl0QixPQUFPLENBQUMsbUJBQW1CO0lBQzNCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxzQkFBc0I7SUFDOUIsT0FBTyxDQUFDLGdCQUFnQjtJQUoxQixZQUNVLG1CQUFtQixFQUFFLG1CQUFtQixFQUN4QyxTQUFTLEVBQUUsU0FBUyxFQUNwQixzQkFBc0IsRUFBRSxpQkFBaUIsRUFDekMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ3hDO0lBRUosc0VBQXNFO0lBQy9ELGFBQWEsQ0FDbEIsYUFBYSxFQUFFLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFDcEUsaUJBQWlCLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRTtRQUFFLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixDQUFBO0tBQUUsS0FBSyx5QkFBeUIsRUFDL0YsY0FBYyxFQUFFLENBQ2QseUJBQXlCLEVBQUUseUJBQXlCLEVBQ3BELElBQUksRUFBRSxZQUFZLEVBQ2xCLGFBQWEsRUFBRSxXQUFXLEVBQUUsR0FBRyxTQUFTLEVBQ3hDLE1BQU0sRUFBRSxZQUFZLEVBQ3BCLEtBQUssRUFBRSxNQUFNLEtBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUtsQjtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSSxRQUFRLENBQUMsTUFBTSxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FvQnZEO0lBRUQ7OztPQUdHO0lBQ0ksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFM0I7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"pxe_debug_utils.d.ts","sourceRoot":"","sources":["../../src/debug/pxe_debug_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC/G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;GAGG;AACH,qBAAa,aAAa;;IAYtB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,gBAAgB;IAJ1B,YACU,mBAAmB,EAAE,mBAAmB,EACxC,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,iBAAiB,EACzC,gBAAgB,EAAE,gBAAgB,EACxC;IAEJ,sEAAsE;IAC/D,aAAa,CAClB,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EACpE,iBAAiB,EAAE,CAAC,SAAS,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,iBAAiB,CAAA;KAAE,KAAK,yBAAyB,EAC/F,eAAe,EAAE,CACf,yBAAyB,EAAE,yBAAyB,EACpD,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,WAAW,EAAE,GAAG,SAAS,EACxC,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,EAClC,KAAK,EAAE,MAAM,KACV,OAAO,CAAC,GAAG,CAAC,QAKlB;IAED;;;;;;;;;;OAUG;IACI,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAmBvD;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;CACF"}
1
+ {"version":3,"file":"pxe_debug_utils.d.ts","sourceRoot":"","sources":["../../src/debug/pxe_debug_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC/G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAErE;;;GAGG;AACH,qBAAa,aAAa;;IAYtB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,gBAAgB;IAJ1B,YACU,mBAAmB,EAAE,mBAAmB,EACxC,SAAS,EAAE,SAAS,EACpB,sBAAsB,EAAE,iBAAiB,EACzC,gBAAgB,EAAE,gBAAgB,EACxC;IAEJ,sEAAsE;IAC/D,aAAa,CAClB,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EACpE,iBAAiB,EAAE,CAAC,SAAS,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,iBAAiB,CAAA;KAAE,KAAK,yBAAyB,EAC/F,cAAc,EAAE,CACd,yBAAyB,EAAE,yBAAyB,EACpD,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,WAAW,EAAE,GAAG,SAAS,EACxC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,MAAM,KACV,OAAO,CAAC,GAAG,CAAC,QAKlB;IAED;;;;;;;;;;OAUG;IACI,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAoBvD;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;CACF"}