@aztec/pxe 0.0.1-commit.f504929 → 0.0.1-commit.f5d02921e

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 (123) hide show
  1. package/dest/block_synchronizer/block_synchronizer.d.ts +1 -1
  2. package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
  3. package/dest/block_synchronizer/block_synchronizer.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/contract_function_simulator/contract_function_simulator.d.ts +9 -3
  8. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  9. package/dest/contract_function_simulator/contract_function_simulator.js +29 -6
  10. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +5 -5
  11. package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
  12. package/dest/contract_function_simulator/execution_tagging_index_cache.js +17 -9
  13. package/dest/contract_function_simulator/index.d.ts +2 -1
  14. package/dest/contract_function_simulator/index.d.ts.map +1 -1
  15. package/dest/contract_function_simulator/index.js +1 -0
  16. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +3 -5
  17. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  18. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +7 -9
  19. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +1 -1
  20. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
  21. package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +1 -3
  22. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +3 -6
  23. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  24. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +5 -10
  25. package/dest/contract_function_simulator/oracle/interfaces.d.ts +26 -21
  26. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  27. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
  28. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
  29. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +38 -0
  30. package/dest/contract_function_simulator/oracle/oracle.d.ts +39 -19
  31. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  32. package/dest/contract_function_simulator/oracle/oracle.js +91 -44
  33. package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
  34. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +11 -36
  35. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  36. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +12 -44
  37. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +50 -28
  38. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  39. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +167 -64
  40. package/dest/contract_logging.d.ts +9 -4
  41. package/dest/contract_logging.d.ts.map +1 -1
  42. package/dest/contract_logging.js +21 -6
  43. package/dest/contract_sync/contract_sync_service.d.ts +7 -4
  44. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
  45. package/dest/contract_sync/contract_sync_service.js +59 -32
  46. package/dest/contract_sync/helpers.d.ts +2 -2
  47. package/dest/contract_sync/helpers.d.ts.map +1 -1
  48. package/dest/contract_sync/helpers.js +7 -2
  49. package/dest/events/event_service.d.ts +3 -2
  50. package/dest/events/event_service.d.ts.map +1 -1
  51. package/dest/events/event_service.js +16 -4
  52. package/dest/logs/log_service.d.ts +6 -7
  53. package/dest/logs/log_service.d.ts.map +1 -1
  54. package/dest/logs/log_service.js +24 -28
  55. package/dest/messages/message_context_service.d.ts +17 -0
  56. package/dest/messages/message_context_service.d.ts.map +1 -0
  57. package/dest/messages/message_context_service.js +36 -0
  58. package/dest/notes/note_service.d.ts +2 -2
  59. package/dest/notes/note_service.d.ts.map +1 -1
  60. package/dest/notes/note_service.js +14 -5
  61. package/dest/oracle_version.d.ts +2 -2
  62. package/dest/oracle_version.js +2 -2
  63. package/dest/pxe.d.ts +6 -3
  64. package/dest/pxe.d.ts.map +1 -1
  65. package/dest/pxe.js +37 -21
  66. package/dest/storage/capsule_store/capsule_service.d.ts +22 -0
  67. package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
  68. package/dest/storage/capsule_store/capsule_service.js +50 -0
  69. package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
  70. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
  71. package/dest/storage/capsule_store/capsule_store.js +33 -28
  72. package/dest/storage/capsule_store/index.d.ts +2 -1
  73. package/dest/storage/capsule_store/index.d.ts.map +1 -1
  74. package/dest/storage/capsule_store/index.js +1 -0
  75. package/dest/storage/metadata.d.ts +1 -1
  76. package/dest/storage/metadata.js +1 -1
  77. package/dest/storage/tagging_store/sender_tagging_store.d.ts +26 -25
  78. package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
  79. package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
  80. package/dest/tagging/index.d.ts +2 -2
  81. package/dest/tagging/index.d.ts.map +1 -1
  82. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +1 -1
  83. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
  84. package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +10 -1
  85. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
  86. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
  87. package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
  88. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +2 -1
  89. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
  90. package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +24 -11
  91. package/package.json +16 -16
  92. package/src/block_synchronizer/block_synchronizer.ts +6 -0
  93. package/src/config/index.ts +1 -1
  94. package/src/contract_function_simulator/contract_function_simulator.ts +40 -7
  95. package/src/contract_function_simulator/execution_tagging_index_cache.ts +16 -11
  96. package/src/contract_function_simulator/index.ts +1 -0
  97. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +8 -8
  98. package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +1 -4
  99. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +3 -9
  100. package/src/contract_function_simulator/oracle/interfaces.ts +38 -29
  101. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +98 -0
  102. package/src/contract_function_simulator/oracle/oracle.ts +120 -64
  103. package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
  104. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +14 -62
  105. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +290 -77
  106. package/src/contract_logging.ts +18 -5
  107. package/src/contract_sync/contract_sync_service.ts +89 -49
  108. package/src/contract_sync/helpers.ts +3 -2
  109. package/src/events/event_service.ts +17 -4
  110. package/src/logs/log_service.ts +51 -46
  111. package/src/messages/message_context_service.ts +44 -0
  112. package/src/notes/note_service.ts +16 -5
  113. package/src/oracle_version.ts +2 -2
  114. package/src/pxe.ts +55 -19
  115. package/src/storage/capsule_store/capsule_service.ts +91 -0
  116. package/src/storage/capsule_store/capsule_store.ts +34 -26
  117. package/src/storage/capsule_store/index.ts +1 -0
  118. package/src/storage/metadata.ts +1 -1
  119. package/src/storage/tagging_store/sender_tagging_store.ts +182 -135
  120. package/src/tagging/index.ts +1 -1
  121. package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +19 -1
  122. package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
  123. package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +19 -9
@@ -1,12 +1,13 @@
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';
@@ -24,6 +25,8 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
24
25
  isMisc = true;
25
26
  isUtility = true;
26
27
  contractLogger;
28
+ aztecnrLogger;
29
+ offchainEffects = [];
27
30
  contractAddress;
28
31
  authWitnesses;
29
32
  capsules;
@@ -35,8 +38,10 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
35
38
  aztecNode;
36
39
  recipientTaggingStore;
37
40
  senderAddressBookStore;
38
- capsuleStore;
41
+ capsuleService;
39
42
  privateEventStore;
43
+ messageContextService;
44
+ contractSyncService;
40
45
  jobId;
41
46
  logger;
42
47
  scopes;
@@ -52,15 +57,31 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
52
57
  this.aztecNode = args.aztecNode;
53
58
  this.recipientTaggingStore = args.recipientTaggingStore;
54
59
  this.senderAddressBookStore = args.senderAddressBookStore;
55
- this.capsuleStore = args.capsuleStore;
60
+ this.capsuleService = args.capsuleService;
56
61
  this.privateEventStore = args.privateEventStore;
62
+ this.messageContextService = args.messageContextService;
63
+ this.contractSyncService = args.contractSyncService;
57
64
  this.jobId = args.jobId;
58
65
  this.logger = args.log ?? createLogger('simulator:client_view_context');
59
66
  this.scopes = args.scopes;
60
67
  }
61
68
  assertCompatibleOracleVersion(version) {
69
+ // TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
70
+ // Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
71
+ // the expected pinned version or the current one. We want to allow for both the pinned and the current versions
72
+ // because we want this code to work with both the pinned and unpinned version since some branches do not have the
73
+ // pinned contracts (like e.g. next)
74
+ const LEGACY_ORACLE_VERSION = 12;
75
+ if (isProtocolContract(this.contractAddress)) {
76
+ if (version !== LEGACY_ORACLE_VERSION && version !== ORACLE_VERSION) {
77
+ const hint = version > ORACLE_VERSION ? '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.';
78
+ throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION}, got ${version})`);
79
+ }
80
+ return;
81
+ }
62
82
  if (version !== ORACLE_VERSION) {
63
- throw new Error(`Incompatible oracle version. Expected version ${ORACLE_VERSION}, got ${version}.`);
83
+ const hint = version > ORACLE_VERSION ? '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 version ${ORACLE_VERSION}, got ${version})`);
64
85
  }
65
86
  }
66
87
  getRandomField() {
@@ -92,12 +113,12 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
92
113
  }
93
114
  /**
94
115
  * 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.
116
+ * @param blockHash - The hash of a block that contains the note hash tree root in which to find the
117
+ * membership witness.
97
118
  * @param noteHash - The note hash to find in the note hash tree.
98
119
  * @returns The membership witness containing the leaf index and sibling path
99
- */ getNoteHashMembershipWitness(anchorBlockHash, noteHash) {
100
- return this.aztecNode.getNoteHashMembershipWitness(anchorBlockHash, noteHash);
120
+ */ getNoteHashMembershipWitness(blockHash, noteHash) {
121
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
101
122
  }
102
123
  /**
103
124
  * Fetches the index and sibling path of a block hash in the archive tree.
@@ -105,12 +126,15 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
105
126
  * Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
106
127
  * its block hash is appended as a new leaf to the archive tree.
107
128
  *
108
- * @param anchorBlockHash - The hash of a block that contains the archive tree root in which to find the membership
129
+ * @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
109
130
  * witness.
110
131
  * @param blockHash - The block hash to find in the archive tree.
111
132
  * @returns The membership witness containing the leaf index and sibling path
112
- */ getBlockHashMembershipWitness(anchorBlockHash, blockHash) {
113
- return this.aztecNode.getBlockHashMembershipWitness(anchorBlockHash, blockHash);
133
+ */ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
134
+ // Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
135
+ // hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
136
+ // membership witness as there is none.
137
+ return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
114
138
  }
115
139
  /**
116
140
  * Returns a nullifier membership witness for a given nullifier at a given block.
@@ -118,7 +142,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
118
142
  * @param nullifier - Nullifier we try to find witness for.
119
143
  * @returns The nullifier membership witness (if found).
120
144
  */ getNullifierMembershipWitness(blockHash, nullifier) {
121
- return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
145
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
122
146
  }
123
147
  /**
124
148
  * Returns a low nullifier membership witness for a given nullifier at a given block.
@@ -129,7 +153,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
129
153
  * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
130
154
  * we are trying to prove non-inclusion for.
131
155
  */ getLowNullifierMembershipWitness(blockHash, nullifier) {
132
- return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
156
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
133
157
  }
134
158
  /**
135
159
  * Returns a public data tree witness for a given leaf slot at a given block.
@@ -137,7 +161,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
137
161
  * @param leafSlot - The slot of the public data tree to get the witness for.
138
162
  * @returns - The witness
139
163
  */ getPublicDataWitness(blockHash, leafSlot) {
140
- return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
164
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
141
165
  }
142
166
  /**
143
167
  * Fetches a block header of a given block.
@@ -152,11 +176,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
152
176
  return block?.header;
153
177
  }
154
178
  /**
155
- * Retrieve the complete address associated to a given address.
179
+ * Retrieve the public keys and partial address associated to a given address.
156
180
  * @param account - The account address.
157
- * @returns A complete address associated with the input address, or `undefined` if not registered.
158
- */ tryGetPublicKeysAndPartialAddress(account) {
159
- return this.addressStore.getCompleteAddress(account);
181
+ * @returns The public keys and partial address, or `undefined` if the account is not registered.
182
+ */ async getPublicKeysAndPartialAddress(account) {
183
+ const completeAddress = await this.addressStore.getCompleteAddress(account);
184
+ if (!completeAddress) {
185
+ return undefined;
186
+ }
187
+ return {
188
+ publicKeys: completeAddress.publicKeys,
189
+ partialAddress: completeAddress.partialAddress
190
+ };
160
191
  }
161
192
  async getCompleteAddressOrFail(account) {
162
193
  const completeAddress = await this.addressStore.getCompleteAddress(account);
@@ -235,7 +266,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
235
266
  * Check if a nullifier exists in the nullifier tree.
236
267
  * @param innerNullifier - The inner nullifier.
237
268
  * @returns A boolean indicating whether the nullifier exists in the tree or not.
238
- */ async checkNullifierExists(innerNullifier) {
269
+ */ async doesNullifierExist(innerNullifier) {
239
270
  const [nullifier, anchorBlockHash] = await Promise.all([
240
271
  siloNullifier(this.contractAddress, innerNullifier),
241
272
  this.anchorBlockHeader.hash()
@@ -246,14 +277,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
246
277
  return leafIndex?.data !== undefined;
247
278
  }
248
279
  /**
249
- * Fetches a message from the executionStore, given its key.
280
+ * Returns the membership witness of an un-nullified L1 to L2 message.
250
281
  * @param contractAddress - Address of a contract by which the message was emitted.
251
282
  * @param messageHash - Hash of the message.
252
283
  * @param secret - Secret used to compute a nullifier.
253
284
  * @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
254
285
  * @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
255
286
  */ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
256
- const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
287
+ const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
257
288
  return new MessageLoadOracleInputs(messageIndex, siblingPath);
258
289
  }
259
290
  /**
@@ -262,34 +293,49 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
262
293
  * @param contractAddress - The address to read storage from.
263
294
  * @param startStorageSlot - The starting storage slot.
264
295
  * @param numberOfElements - Number of elements to read from the starting storage slot.
265
- */ async storageRead(blockHash, contractAddress, startStorageSlot, numberOfElements) {
266
- const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
267
- const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
268
- this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
269
- return values;
296
+ */ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
297
+ return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
298
+ const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
299
+ const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
300
+ this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
301
+ return values;
302
+ });
270
303
  }
271
304
  /**
272
- * Returns a per-contract logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
305
+ * Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
273
306
  */ async #getContractLogger() {
274
307
  if (!this.contractLogger) {
275
308
  // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
276
309
  // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
277
- this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
310
+ this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
278
311
  instanceId: this.jobId
279
312
  });
280
313
  }
281
314
  return this.contractLogger;
282
315
  }
316
+ /**
317
+ * Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
318
+ */ async #getAztecnrLogger() {
319
+ if (!this.aztecnrLogger) {
320
+ // Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
321
+ // to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
322
+ this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
323
+ instanceId: this.jobId
324
+ });
325
+ }
326
+ return this.aztecnrLogger;
327
+ }
283
328
  async log(level, message, fields) {
284
329
  if (!LogLevels[level]) {
285
330
  throw new Error(`Invalid log level: ${level}`);
286
331
  }
287
- const logger = await this.#getContractLogger();
288
- logContractMessage(logger, LogLevels[level], message, fields);
332
+ const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
333
+ const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
334
+ logContractMessage(logger, LogLevels[level], strippedMessage, fields);
289
335
  }
290
- async fetchTaggedLogs(pendingTaggedLogArrayBaseSlot) {
291
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
292
- await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
336
+ async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
337
+ const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleService, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
338
+ await logService.fetchTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, scope);
293
339
  }
294
340
  /**
295
341
  * Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
@@ -300,88 +346,145 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
300
346
  * @param contractAddress - The address of the contract that the logs are tagged for.
301
347
  * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
302
348
  * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
303
- */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
349
+ */ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
304
350
  // TODO(#10727): allow other contracts to store notes
305
351
  if (!this.contractAddress.equals(contractAddress)) {
306
352
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
307
353
  }
308
354
  // We read all note and event validation requests and process them all concurrently. This makes the process much
309
355
  // faster as we don't need to wait for the network round-trip.
310
- const noteValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId)).map(NoteValidationRequest.fromFields);
311
- const eventValidationRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId)).map(EventValidationRequest.fromFields);
356
+ const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
357
+ const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
312
358
  const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
313
- 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));
359
+ 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));
314
360
  const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
315
- const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, request.recipient));
361
+ const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
316
362
  await Promise.all([
317
363
  ...noteStorePromises,
318
364
  ...eventStorePromises
319
365
  ]);
320
366
  // Requests are cleared once we're done.
321
- await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
322
- await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
367
+ await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
368
+ await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
323
369
  }
324
- async bulkRetrieveLogs(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot) {
370
+ async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
325
371
  // TODO(#10727): allow other contracts to process partial notes
326
372
  if (!this.contractAddress.equals(contractAddress)) {
327
373
  throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
328
374
  }
329
375
  // We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
330
376
  // don't need to wait for the network round-trip.
331
- const logRetrievalRequests = (await this.capsuleStore.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId)).map(LogRetrievalRequest.fromFields);
332
- const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
333
- const maybeLogRetrievalResponses = await logService.bulkRetrieveLogs(logRetrievalRequests);
377
+ const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
378
+ const logService = new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.capsuleService, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
379
+ const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
334
380
  // Requests are cleared once we're done.
335
- await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId);
381
+ await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
336
382
  // The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
337
- await this.capsuleStore.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId);
383
+ await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
338
384
  }
339
- storeCapsule(contractAddress, slot, capsule) {
385
+ async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
386
+ try {
387
+ if (!this.contractAddress.equals(contractAddress)) {
388
+ throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
389
+ }
390
+ // TODO(@mverzilli): this is a prime example of where using a volatile array would make much more sense, we don't
391
+ // need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
392
+ // At the same time, we don't want to allow any global scope access other than where backwards compatibility
393
+ // forces us to. Hence we need the scope here to be artificial.
394
+ const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
395
+ const txHashes = requestCapsules.map((fields, i)=>{
396
+ if (fields.length !== 1) {
397
+ throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
398
+ }
399
+ return fields[0];
400
+ });
401
+ const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
402
+ // Leave response in response capsule array.
403
+ await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
404
+ } finally{
405
+ await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
406
+ }
407
+ }
408
+ setCapsule(contractAddress, slot, capsule, scope) {
340
409
  if (!contractAddress.equals(this.contractAddress)) {
341
410
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
342
411
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
343
412
  }
344
- this.capsuleStore.storeCapsule(this.contractAddress, slot, capsule, this.jobId);
345
- return Promise.resolve();
413
+ this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
346
414
  }
347
- async loadCapsule(contractAddress, slot) {
415
+ getCapsule(contractAddress, slot, scope) {
348
416
  if (!contractAddress.equals(this.contractAddress)) {
349
417
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
350
418
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
351
419
  }
352
- return(// TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
353
- this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
420
+ return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
354
421
  }
355
- deleteCapsule(contractAddress, slot) {
422
+ deleteCapsule(contractAddress, slot, scope) {
356
423
  if (!contractAddress.equals(this.contractAddress)) {
357
424
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
358
425
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
359
426
  }
360
- this.capsuleStore.deleteCapsule(this.contractAddress, slot, this.jobId);
361
- return Promise.resolve();
427
+ this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
362
428
  }
363
- copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
429
+ copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
364
430
  if (!contractAddress.equals(this.contractAddress)) {
365
431
  // TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
366
432
  throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
367
433
  }
368
- return this.capsuleStore.copyCapsule(this.contractAddress, srcSlot, dstSlot, numEntries, this.jobId);
434
+ return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
435
+ }
436
+ /**
437
+ * Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
438
+ * stored notes or events are discovered.
439
+ */ setContractSyncCacheInvalid(contractAddress, scopes) {
440
+ if (!contractAddress.equals(this.contractAddress)) {
441
+ throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
442
+ }
443
+ this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
369
444
  }
370
445
  // TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
371
- aes128Decrypt(ciphertext, iv, symKey) {
446
+ decryptAes128(ciphertext, iv, symKey) {
372
447
  const aes128 = new Aes128();
373
448
  return aes128.decryptBufferCBC(ciphertext, iv, symKey);
374
449
  }
375
450
  /**
376
- * Retrieves the shared secret for a given address and ephemeral public key.
451
+ * Retrieves the app-siloed shared secret for a given address and ephemeral public key.
377
452
  * @param address - The address to get the secret for.
378
453
  * @param ephPk - The ephemeral public key to get the secret for.
379
- * @returns The secret for the given address.
380
- */ async getSharedSecret(address, ephPk) {
381
- // TODO(#12656): return an app-siloed secret
454
+ * @param contractAddress - The contract address for app-siloing (validated against execution context).
455
+ * @returns The app-siloed shared secret as a Field.
456
+ */ async getSharedSecret(address, ephPk, contractAddress) {
457
+ if (!contractAddress.equals(this.contractAddress)) {
458
+ throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
459
+ }
382
460
  const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
383
461
  const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
384
462
  const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
385
- return deriveEcdhSharedSecret(addressSecret, ephPk);
463
+ return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
464
+ }
465
+ emitOffchainEffect(data) {
466
+ this.offchainEffects.push({
467
+ data,
468
+ contractAddress: this.contractAddress
469
+ });
470
+ return Promise.resolve();
471
+ }
472
+ /** Returns offchain effects collected during execution. */ getOffchainEffects() {
473
+ return this.offchainEffects;
474
+ }
475
+ /** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
476
+ const [response] = await Promise.all([
477
+ query(),
478
+ (async ()=>{
479
+ const header = await this.aztecNode.getBlockHeader(blockHash);
480
+ if (!header) {
481
+ throw new Error(`Could not find block header for block hash ${blockHash}`);
482
+ }
483
+ if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
484
+ 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()}).`);
485
+ }
486
+ })()
487
+ ]);
488
+ return response;
386
489
  }
387
490
  }
@@ -4,10 +4,11 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
4
  import type { DebugLog } from '@aztec/stdlib/logs';
5
5
  /** Resolves a contract address to a human-readable name, if available. */
6
6
  export type ContractNameResolver = (address: AztecAddress) => Promise<string | undefined>;
7
+ export type CONTRACT_LOG_KIND = 'aztecnr' | 'user';
7
8
  /**
8
- * Creates a logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
9
+ * Creates a logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
9
10
  */
10
- export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, options?: {
11
+ export declare function createContractLogger(contractAddress: AztecAddress, getContractName: ContractNameResolver, kind: CONTRACT_LOG_KIND, options?: {
11
12
  instanceId?: string;
12
13
  }): Promise<Logger>;
13
14
  /**
@@ -16,7 +17,11 @@ export declare function createContractLogger(contractAddress: AztecAddress, getC
16
17
  export declare function logContractMessage(logger: Logger, level: LogLevel, message: string, fields: Fr[]): void;
17
18
  /**
18
19
  * Displays debug logs collected during public function simulation,
19
- * using the `contract_log::` prefixed logger format.
20
+ * using the `contract:` prefixed logger format.
20
21
  */
21
22
  export declare function displayDebugLogs(debugLogs: DebugLog[], getContractName: ContractNameResolver): Promise<void>;
22
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfbG9nZ2luZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyYWN0X2xvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssTUFBTSxFQUF1QyxNQUFNLHVCQUF1QixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELDBFQUEwRTtBQUMxRSxNQUFNLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFFMUY7O0dBRUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGVBQWUsRUFBRSxvQkFBb0IsRUFDckMsT0FBTyxDQUFDLEVBQUU7SUFBRSxVQUFVLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxHQUNoQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBS2pCO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0Isa0JBQWtCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FFdkc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxFQUFFLGVBQWUsRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBS2xIIn0=
23
+ export declare function stripAztecnrLogPrefix(message: string): {
24
+ kind: CONTRACT_LOG_KIND;
25
+ message: string;
26
+ };
27
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfbG9nZ2luZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnRyYWN0X2xvZ2dpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFFLEtBQUssTUFBTSxFQUF1QyxNQUFNLHVCQUF1QixDQUFDO0FBQ3hHLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELDBFQUEwRTtBQUMxRSxNQUFNLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7QUFDMUYsTUFBTSxNQUFNLGlCQUFpQixHQUFHLFNBQVMsR0FBRyxNQUFNLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCx3QkFBc0Isb0JBQW9CLENBQ3hDLGVBQWUsRUFBRSxZQUFZLEVBQzdCLGVBQWUsRUFBRSxvQkFBb0IsRUFDckMsSUFBSSxFQUFFLGlCQUFpQixFQUN2QixPQUFPLENBQUMsRUFBRTtJQUFFLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQ2hDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FPakI7QUFFRDs7R0FFRztBQUNILHdCQUFnQixrQkFBa0IsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUV2RztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUUsZUFBZSxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNbEg7QUFFRCx3QkFBZ0IscUJBQXFCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRztJQUFFLElBQUksRUFBRSxpQkFBaUIsQ0FBQztJQUFDLE9BQU8sRUFBRSxNQUFNLENBQUE7Q0FBRSxDQU1uRyJ9
@@ -1 +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"}
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;AAC1F,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,MAAM,CAAC;AAEnD;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,oBAAoB,EACrC,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAAC,MAAM,CAAC,CAOjB;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,CAMlH;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAMnG"}
@@ -1,10 +1,11 @@
1
1
  import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
2
2
  /**
3
- * Creates a logger whose output is prefixed with `contract_log::<name>(<addrAbbrev>)`.
4
- */ export async function createContractLogger(contractAddress, getContractName, options) {
3
+ * Creates a logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
4
+ */ export async function createContractLogger(contractAddress, getContractName, kind, options) {
5
5
  const addrAbbrev = contractAddress.toString().slice(0, 10);
6
6
  const name = await getContractName(contractAddress);
7
- const module = name ? `contract_log::${name}(${addrAbbrev})` : `contract_log::Unknown(${addrAbbrev})`;
7
+ const prefix = kind == 'aztecnr' ? 'aztecnr' : 'contract';
8
+ const module = name ? `${prefix}:${name}(${addrAbbrev})` : `${prefix}:Unknown(${addrAbbrev})`;
8
9
  return createLogger(module, options);
9
10
  }
10
11
  /**
@@ -14,10 +15,24 @@ import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
14
15
  }
15
16
  /**
16
17
  * Displays debug logs collected during public function simulation,
17
- * using the `contract_log::` prefixed logger format.
18
+ * using the `contract:` prefixed logger format.
18
19
  */ export async function displayDebugLogs(debugLogs, getContractName) {
19
20
  for (const log of debugLogs){
20
- const logger = await createContractLogger(log.contractAddress, getContractName);
21
- logContractMessage(logger, log.level, log.message, log.fields);
21
+ const { kind, message } = stripAztecnrLogPrefix(log.message);
22
+ const logger = await createContractLogger(log.contractAddress, getContractName, kind);
23
+ logContractMessage(logger, log.level, message, log.fields);
24
+ }
25
+ }
26
+ export function stripAztecnrLogPrefix(message) {
27
+ if (message.startsWith('[aztec-nr] ')) {
28
+ return {
29
+ kind: 'aztecnr',
30
+ message: message.slice('[aztec-nr] '.length)
31
+ };
32
+ } else {
33
+ return {
34
+ kind: 'user',
35
+ message
36
+ };
22
37
  }
23
38
  }
@@ -18,13 +18,14 @@ export declare class ContractSyncService implements StagedStore {
18
18
  private aztecNode;
19
19
  private contractStore;
20
20
  private noteStore;
21
+ private getRegisteredAccounts;
21
22
  private log;
22
23
  readonly storeName = "contract_sync";
23
24
  private syncedContracts;
24
- private overriddenContracts;
25
- constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, log: Logger);
25
+ private excludedFromSync;
26
+ constructor(aztecNode: AztecNode, contractStore: ContractStore, noteStore: NoteStore, getRegisteredAccounts: () => Promise<AztecAddress[]>, log: Logger);
26
27
  /** Sets contracts that should be skipped during sync for a specific job. */
27
- setOverriddenContracts(jobId: string, addresses: Set<string>): void;
28
+ setExcludedFromSync(jobId: string, addresses: Set<string>): void;
28
29
  /**
29
30
  * Ensures a contract's private state is synchronized and that the PXE holds the current class artifact.
30
31
  * Uses a cache to avoid redundant sync operations - the cache is wiped when the anchor block changes.
@@ -35,9 +36,11 @@ export declare class ContractSyncService implements StagedStore {
35
36
  * @param scopes - Access scopes to pass through to the utility executor (affects whose account's private state is discovered).
36
37
  */
37
38
  ensureContractSynced(contractAddress: AztecAddress, functionToInvokeAfterSync: FunctionSelector | null, utilityExecutor: (call: FunctionCall, scopes: AccessScopes) => Promise<any>, anchorBlockHeader: BlockHeader, jobId: string, scopes: AccessScopes): Promise<void>;
39
+ /** Clears sync cache entries for the given scopes of a contract. Also clears the ALL_SCOPES entry. */
40
+ invalidateContractForScopes(contractAddress: AztecAddress, scopes: AztecAddress[]): void;
38
41
  /** Clears sync cache. Called by BlockSynchronizer when anchor block changes. */
39
42
  wipe(): void;
40
43
  commit(jobId: string): Promise<void>;
41
44
  discardStaged(jobId: string): Promise<void>;
42
45
  }
43
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsR0FBRztJQWRiLFFBQVEsQ0FBQyxTQUFTLG1CQUFtQjtJQUtyQyxPQUFPLENBQUMsZUFBZSxDQUF5QztJQUdoRSxPQUFPLENBQUMsbUJBQW1CLENBQXVDO0lBRWxFLFlBQ1UsU0FBUyxFQUFFLFNBQVMsRUFDcEIsYUFBYSxFQUFFLGFBQWEsRUFDNUIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsR0FBRyxFQUFFLE1BQU0sRUFDakI7SUFFSiw0RUFBNEU7SUFDNUUsc0JBQXNCLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FFbEU7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG9CQUFvQixDQUN4QixlQUFlLEVBQUUsWUFBWSxFQUM3Qix5QkFBeUIsRUFBRSxnQkFBZ0IsR0FBRyxJQUFJLEVBQ2xELGVBQWUsRUFBRSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFlBQVksS0FBSyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQzNFLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsS0FBSyxFQUFFLE1BQU0sRUFDYixNQUFNLEVBQUUsWUFBWSxHQUNuQixPQUFPLENBQUMsSUFBSSxDQUFDLENBdUNmO0lBNEJELGdGQUFnRjtJQUNoRixJQUFJLElBQUksSUFBSSxDQUdYO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUluQztJQUVELGFBQWEsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FNMUM7Q0FDRiJ9
46
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3Rfc3luY19zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3Rfc3luYy9jb250cmFjdF9zeW5jX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDakYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFHckU7Ozs7O0dBS0c7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxXQUFXOztJQVluRCxPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMscUJBQXFCO0lBQzdCLE9BQU8sQ0FBQyxHQUFHO0lBZmIsUUFBUSxDQUFDLFNBQVMsbUJBQW1CO0lBS3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlDO0lBR2hFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBdUM7SUFFL0QsWUFDVSxTQUFTLEVBQUUsU0FBUyxFQUNwQixhQUFhLEVBQUUsYUFBYSxFQUM1QixTQUFTLEVBQUUsU0FBUyxFQUNwQixxQkFBcUIsRUFBRSxNQUFNLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxFQUNwRCxHQUFHLEVBQUUsTUFBTSxFQUNqQjtJQUVKLDRFQUE0RTtJQUM1RSxtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUUvRDtJQUVEOzs7Ozs7OztPQVFHO0lBQ0csb0JBQW9CLENBQ3hCLGVBQWUsRUFBRSxZQUFZLEVBQzdCLHlCQUF5QixFQUFFLGdCQUFnQixHQUFHLElBQUksRUFDbEQsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFDM0UsaUJBQWlCLEVBQUUsV0FBVyxFQUM5QixLQUFLLEVBQUUsTUFBTSxFQUNiLE1BQU0sRUFBRSxZQUFZLEdBQ25CLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FpQmY7SUFFRCxzR0FBc0c7SUFDdEcsMkJBQTJCLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsSUFBSSxDQU12RjtJQXNDRCxnRkFBZ0Y7SUFDaEYsSUFBSSxJQUFJLElBQUksQ0FHWDtJQUVELE1BQU0sQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJbkM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBTTFDO0NBMkNGIn0=
@@ -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,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"}
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,qBAAqB;IAC7B,OAAO,CAAC,GAAG;IAfb,QAAQ,CAAC,SAAS,mBAAmB;IAKrC,OAAO,CAAC,eAAe,CAAyC;IAGhE,OAAO,CAAC,gBAAgB,CAAuC;IAE/D,YACU,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,qBAAqB,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,EACpD,GAAG,EAAE,MAAM,EACjB;IAEJ,4EAA4E;IAC5E,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAE/D;IAED;;;;;;;;OAQG;IACG,oBAAoB,CACxB,eAAe,EAAE,YAAY,EAC7B,yBAAyB,EAAE,gBAAgB,GAAG,IAAI,EAClD,eAAe,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,EAC3E,iBAAiB,EAAE,WAAW,EAC9B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CAiBf;IAED,sGAAsG;IACtG,2BAA2B,CAAC,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAMvF;IAsCD,gFAAgF;IAChF,IAAI,IAAI,IAAI,CAGX;IAED,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAInC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1C;CA2CF"}