@aztec/pxe 0.0.1-commit.3fd054f6 → 0.0.1-commit.42ee6df9b

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 (118) 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/contract_function_simulator/contract_function_simulator.d.ts +3 -4
  5. package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
  6. package/dest/contract_function_simulator/contract_function_simulator.js +4 -3
  7. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +2 -3
  8. package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
  9. package/dest/contract_function_simulator/noir-structs/event_validation_request.js +2 -5
  10. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +2 -3
  11. package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
  12. package/dest/contract_function_simulator/noir-structs/note_validation_request.js +2 -5
  13. package/dest/contract_function_simulator/oracle/interfaces.d.ts +19 -19
  14. package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
  15. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +1 -1
  16. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -1
  17. package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +18 -22
  18. package/dest/contract_function_simulator/oracle/oracle.d.ts +38 -19
  19. package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
  20. package/dest/contract_function_simulator/oracle/oracle.js +60 -39
  21. package/dest/contract_function_simulator/oracle/private_execution.js +1 -1
  22. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +7 -8
  23. package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
  24. package/dest/contract_function_simulator/oracle/private_execution_oracle.js +16 -7
  25. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +30 -29
  26. package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
  27. package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +115 -79
  28. package/dest/contract_logging.d.ts +9 -4
  29. package/dest/contract_logging.d.ts.map +1 -1
  30. package/dest/contract_logging.js +21 -6
  31. package/dest/contract_sync/contract_sync_service.d.ts +3 -4
  32. package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
  33. package/dest/contract_sync/contract_sync_service.js +12 -22
  34. package/dest/contract_sync/helpers.d.ts +2 -3
  35. package/dest/contract_sync/helpers.d.ts.map +1 -1
  36. package/dest/contract_sync/helpers.js +7 -2
  37. package/dest/debug/pxe_debug_utils.d.ts +3 -3
  38. package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
  39. package/dest/entrypoints/client/bundle/index.d.ts +1 -2
  40. package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
  41. package/dest/entrypoints/client/bundle/index.js +0 -1
  42. package/dest/entrypoints/client/lazy/index.d.ts +1 -2
  43. package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
  44. package/dest/entrypoints/client/lazy/index.js +0 -1
  45. package/dest/entrypoints/server/index.d.ts +1 -2
  46. package/dest/entrypoints/server/index.d.ts.map +1 -1
  47. package/dest/entrypoints/server/index.js +0 -1
  48. package/dest/events/event_service.d.ts +3 -2
  49. package/dest/events/event_service.d.ts.map +1 -1
  50. package/dest/events/event_service.js +16 -4
  51. package/dest/logs/log_service.d.ts +6 -7
  52. package/dest/logs/log_service.d.ts.map +1 -1
  53. package/dest/logs/log_service.js +32 -30
  54. package/dest/messages/message_context_service.d.ts +3 -3
  55. package/dest/messages/message_context_service.d.ts.map +1 -1
  56. package/dest/messages/message_context_service.js +3 -3
  57. package/dest/notes/note_service.d.ts +4 -5
  58. package/dest/notes/note_service.d.ts.map +1 -1
  59. package/dest/notes/note_service.js +14 -5
  60. package/dest/notes_filter.d.ts +2 -3
  61. package/dest/notes_filter.d.ts.map +1 -1
  62. package/dest/oracle_version.d.ts +2 -2
  63. package/dest/oracle_version.js +2 -2
  64. package/dest/pxe.d.ts +4 -5
  65. package/dest/pxe.d.ts.map +1 -1
  66. package/dest/pxe.js +6 -4
  67. package/dest/storage/capsule_store/capsule_service.d.ts +21 -0
  68. package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
  69. package/dest/storage/capsule_store/capsule_service.js +50 -0
  70. package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
  71. package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
  72. package/dest/storage/capsule_store/capsule_store.js +33 -28
  73. package/dest/storage/capsule_store/index.d.ts +2 -1
  74. package/dest/storage/capsule_store/index.d.ts.map +1 -1
  75. package/dest/storage/capsule_store/index.js +1 -0
  76. package/dest/storage/metadata.d.ts +1 -1
  77. package/dest/storage/metadata.js +1 -1
  78. package/dest/storage/note_store/note_store.d.ts +1 -1
  79. package/dest/storage/note_store/note_store.d.ts.map +1 -1
  80. package/dest/storage/note_store/note_store.js +2 -2
  81. package/package.json +16 -16
  82. package/src/block_synchronizer/block_synchronizer.ts +6 -0
  83. package/src/contract_function_simulator/contract_function_simulator.ts +6 -6
  84. package/src/contract_function_simulator/noir-structs/event_validation_request.ts +0 -3
  85. package/src/contract_function_simulator/noir-structs/note_validation_request.ts +0 -3
  86. package/src/contract_function_simulator/oracle/interfaces.ts +26 -17
  87. package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +13 -50
  88. package/src/contract_function_simulator/oracle/oracle.ts +79 -33
  89. package/src/contract_function_simulator/oracle/private_execution.ts +1 -1
  90. package/src/contract_function_simulator/oracle/private_execution_oracle.ts +19 -10
  91. package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +204 -91
  92. package/src/contract_logging.ts +18 -5
  93. package/src/contract_sync/contract_sync_service.ts +32 -43
  94. package/src/contract_sync/helpers.ts +4 -4
  95. package/src/debug/pxe_debug_utils.ts +3 -3
  96. package/src/entrypoints/client/bundle/index.ts +0 -1
  97. package/src/entrypoints/client/lazy/index.ts +0 -1
  98. package/src/entrypoints/server/index.ts +0 -1
  99. package/src/events/event_service.ts +17 -4
  100. package/src/logs/log_service.ts +63 -48
  101. package/src/messages/message_context_service.ts +3 -4
  102. package/src/notes/note_service.ts +18 -8
  103. package/src/notes_filter.ts +1 -3
  104. package/src/oracle_version.ts +2 -2
  105. package/src/pxe.ts +11 -10
  106. package/src/storage/capsule_store/capsule_service.ts +90 -0
  107. package/src/storage/capsule_store/capsule_store.ts +34 -26
  108. package/src/storage/capsule_store/index.ts +1 -0
  109. package/src/storage/metadata.ts +1 -1
  110. package/src/storage/note_store/note_store.ts +2 -5
  111. package/dest/access_scopes.d.ts +0 -9
  112. package/dest/access_scopes.d.ts.map +0 -1
  113. package/dest/access_scopes.js +0 -6
  114. package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts +0 -16
  115. package/dest/contract_function_simulator/noir-structs/message_tx_context.d.ts.map +0 -1
  116. package/dest/contract_function_simulator/noir-structs/message_tx_context.js +0 -57
  117. package/src/access_scopes.ts +0 -9
  118. package/src/contract_function_simulator/noir-structs/message_tx_context.ts +0 -55
package/src/pxe.ts CHANGED
@@ -52,7 +52,6 @@ import {
52
52
 
53
53
  import { inspect } from 'util';
54
54
 
55
- import type { AccessScopes } from './access_scopes.js';
56
55
  import { BlockSynchronizer } from './block_synchronizer/index.js';
57
56
  import type { PXEConfig } from './config/index.js';
58
57
  import { BenchmarkedNodeFactory } from './contract_function_simulator/benchmarked_node.js';
@@ -96,7 +95,7 @@ export type ProfileTxOpts = {
96
95
  /** If true, proof generation is skipped during profiling. Defaults to true. */
97
96
  skipProofGeneration?: boolean;
98
97
  /** Addresses whose private state and keys are accessible during private execution. */
99
- scopes: AccessScopes;
98
+ scopes: AztecAddress[];
100
99
  };
101
100
 
102
101
  /** Options for PXE.simulateTx. */
@@ -112,7 +111,7 @@ export type SimulateTxOpts = {
112
111
  /** State overrides for the simulation, such as contract instances and artifacts. Requires skipKernels: true */
113
112
  overrides?: SimulationOverrides;
114
113
  /** Addresses whose private state and keys are accessible during private execution */
115
- scopes: AccessScopes;
114
+ scopes: AztecAddress[];
116
115
  };
117
116
 
118
117
  /** Options for PXE.executeUtility. */
@@ -120,7 +119,7 @@ export type ExecuteUtilityOpts = {
120
119
  /** The authentication witnesses required for the function call. */
121
120
  authwits?: AuthWitness[];
122
121
  /** The accounts whose notes we can access in this call */
123
- scopes: AccessScopes;
122
+ scopes: AztecAddress[];
124
123
  };
125
124
 
126
125
  /** Args for PXE.create. */
@@ -368,7 +367,7 @@ export class PXE {
368
367
  async #executePrivate(
369
368
  contractFunctionSimulator: ContractFunctionSimulator,
370
369
  txRequest: TxExecutionRequest,
371
- scopes: AccessScopes,
370
+ scopes: AztecAddress[],
372
371
  jobId: string,
373
372
  ): Promise<PrivateExecutionResult> {
374
373
  const { origin: contractAddress, functionSelector } = txRequest;
@@ -417,7 +416,7 @@ export class PXE {
417
416
  contractFunctionSimulator: ContractFunctionSimulator,
418
417
  call: FunctionCall,
419
418
  authWitnesses: AuthWitness[] | undefined,
420
- scopes: AccessScopes,
419
+ scopes: AztecAddress[],
421
420
  jobId: string,
422
421
  ) {
423
422
  try {
@@ -502,7 +501,9 @@ export class PXE {
502
501
  * @returns The synced block header
503
502
  */
504
503
  public getSyncedBlockHeader(): Promise<BlockHeader> {
505
- return this.anchorBlockStore.getBlockHeader();
504
+ return this.#putInJobQueue(() => {
505
+ return this.anchorBlockStore.getBlockHeader();
506
+ });
506
507
  }
507
508
 
508
509
  /**
@@ -1040,7 +1041,7 @@ export class PXE {
1040
1041
  inspect(txRequest),
1041
1042
  `simulatePublic=${simulatePublic}`,
1042
1043
  `skipTxValidation=${skipTxValidation}`,
1043
- `scopes=${scopes === 'ALL_SCOPES' ? scopes : scopes.map(s => s.toString()).join(', ')}`,
1044
+ `scopes=${scopes.map(s => s.toString()).join(', ')}`,
1044
1045
  );
1045
1046
  }
1046
1047
  });
@@ -1052,7 +1053,7 @@ export class PXE {
1052
1053
  */
1053
1054
  public executeUtility(
1054
1055
  call: FunctionCall,
1055
- { authwits, scopes }: ExecuteUtilityOpts = { scopes: 'ALL_SCOPES' },
1056
+ { authwits, scopes }: ExecuteUtilityOpts = { scopes: [] },
1056
1057
  ): Promise<UtilityExecutionResult> {
1057
1058
  // We disable concurrent executions since those might execute oracles which read and write to the PXE stores (e.g.
1058
1059
  // to the capsules), and we need to prevent concurrent runs from interfering with one another (e.g. attempting to
@@ -1110,7 +1111,7 @@ export class PXE {
1110
1111
  throw this.#contextualizeError(
1111
1112
  err,
1112
1113
  `executeUtility ${to}:${name}(${stringifiedArgs})`,
1113
- `scopes=${scopes === 'ALL_SCOPES' ? scopes : scopes.map(s => s.toString()).join(', ')}`,
1114
+ `scopes=${scopes.map(s => s.toString()).join(', ')}`,
1114
1115
  );
1115
1116
  }
1116
1117
  });
@@ -0,0 +1,90 @@
1
+ import type { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
3
+ import type { Capsule } from '@aztec/stdlib/tx';
4
+
5
+ import type { CapsuleStore } from './capsule_store.js';
6
+
7
+ /**
8
+ * Wraps a CapsuleStore with scope-based access control. Each operation asserts that the requested scope is in the
9
+ * allowed scopes list before delegating to the underlying store.
10
+ */
11
+ export class CapsuleService {
12
+ constructor(
13
+ private readonly capsuleStore: CapsuleStore,
14
+ private readonly allowedScopes: AztecAddress[],
15
+ ) {}
16
+
17
+ setCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[], jobId: string, scope: AztecAddress) {
18
+ assertAllowedScope(scope, this.allowedScopes);
19
+ this.capsuleStore.setCapsule(contractAddress, slot, capsule, jobId, scope);
20
+ }
21
+
22
+ async getCapsule(
23
+ contractAddress: AztecAddress,
24
+ slot: Fr,
25
+ jobId: string,
26
+ scope: AztecAddress,
27
+ transientCapsules?: Capsule[],
28
+ ): Promise<Fr[] | null> {
29
+ assertAllowedScope(scope, this.allowedScopes);
30
+
31
+ // TODO(#12425): On the following line, the pertinent capsule gets overshadowed by the transient one. Tackle this.
32
+ const maybeTransientCapsule = transientCapsules?.find(
33
+ c =>
34
+ c.contractAddress.equals(contractAddress) &&
35
+ c.storageSlot.equals(slot) &&
36
+ (c.scope ?? AztecAddress.ZERO).equals(scope),
37
+ )?.data;
38
+
39
+ return maybeTransientCapsule ?? (await this.capsuleStore.getCapsule(contractAddress, slot, jobId, scope));
40
+ }
41
+
42
+ deleteCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string, scope: AztecAddress) {
43
+ assertAllowedScope(scope, this.allowedScopes);
44
+ this.capsuleStore.deleteCapsule(contractAddress, slot, jobId, scope);
45
+ }
46
+
47
+ copyCapsule(
48
+ contractAddress: AztecAddress,
49
+ srcSlot: Fr,
50
+ dstSlot: Fr,
51
+ numEntries: number,
52
+ jobId: string,
53
+ scope: AztecAddress,
54
+ ): Promise<void> {
55
+ assertAllowedScope(scope, this.allowedScopes);
56
+ return this.capsuleStore.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, jobId, scope);
57
+ }
58
+
59
+ appendToCapsuleArray(
60
+ contractAddress: AztecAddress,
61
+ baseSlot: Fr,
62
+ content: Fr[][],
63
+ jobId: string,
64
+ scope: AztecAddress,
65
+ ): Promise<void> {
66
+ assertAllowedScope(scope, this.allowedScopes);
67
+ return this.capsuleStore.appendToCapsuleArray(contractAddress, baseSlot, content, jobId, scope);
68
+ }
69
+
70
+ readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, jobId: string, scope: AztecAddress): Promise<Fr[][]> {
71
+ assertAllowedScope(scope, this.allowedScopes);
72
+ return this.capsuleStore.readCapsuleArray(contractAddress, baseSlot, jobId, scope);
73
+ }
74
+
75
+ setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][], jobId: string, scope: AztecAddress) {
76
+ assertAllowedScope(scope, this.allowedScopes);
77
+ return this.capsuleStore.setCapsuleArray(contractAddress, baseSlot, content, jobId, scope);
78
+ }
79
+ }
80
+
81
+ function assertAllowedScope(scope: AztecAddress, allowedScopes: AztecAddress[]) {
82
+ if (scope.equals(AztecAddress.ZERO)) {
83
+ return;
84
+ }
85
+ if (!allowedScopes.some((allowed: AztecAddress) => allowed.equals(scope))) {
86
+ throw new Error(
87
+ `Scope ${scope.toString()} is not in the allowed scopes list: [${allowedScopes.map((s: AztecAddress) => s.toString()).join(', ')}]. See https://docs.aztec.network/errors/10`,
88
+ );
89
+ }
90
+ }
@@ -1,7 +1,7 @@
1
1
  import { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import { type Logger, createLogger } from '@aztec/foundation/log';
3
3
  import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
4
- import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
5
5
 
6
6
  import type { StagedStore } from '../../job_coordinator/job_coordinator.js';
7
7
 
@@ -10,11 +10,12 @@ export class CapsuleStore implements StagedStore {
10
10
 
11
11
  #store: AztecAsyncKVStore;
12
12
 
13
- // Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${key}`
13
+ // Arbitrary data stored by contracts. Key is computed as `${contractAddress}:${scope}:${key}`, using the zero
14
+ // address for the global scope.
14
15
  #capsules: AztecAsyncMap<string, Buffer>;
15
16
 
16
- // jobId => `${contractAddress}:${key}` => capsule data
17
- // when `#stagedCapsules.get('some-job-id').get('${some-contract-address:some-key') === null`,
17
+ // jobId => `${contractAddress}:${scope}:${key}` => capsule data
18
+ // when `#stagedCapsules.get('some-job-id').get('${some-contract-address}:${some-scope}:${some-key}') === null`,
18
19
  // it signals that the capsule was deleted during the job, so it needs to be deleted on commit
19
20
  #stagedCapsules: Map<string, Map<string, Buffer | null>>;
20
21
 
@@ -134,8 +135,8 @@ export class CapsuleStore implements StagedStore {
134
135
  * to public contract storage in that it's indexed by the contract address and storage slot but instead of the global
135
136
  * network state it's backed by local PXE db.
136
137
  */
137
- storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[], jobId: string) {
138
- const dbSlotKey = dbSlotToKey(contractAddress, slot);
138
+ setCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[], jobId: string, scope: AztecAddress) {
139
+ const dbSlotKey = dbSlotToKey(contractAddress, slot, scope);
139
140
 
140
141
  // A store overrides any pre-existing data on the slot
141
142
  this.#setOnStage(jobId, dbSlotKey, Buffer.concat(capsule.map(value => value.toBuffer())));
@@ -147,8 +148,8 @@ export class CapsuleStore implements StagedStore {
147
148
  * @param slot - The slot in the database to read.
148
149
  * @returns The stored data or `null` if no data is stored under the slot.
149
150
  */
150
- async loadCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string): Promise<Fr[] | null> {
151
- const dataBuffer = await this.#getFromStage(jobId, dbSlotToKey(contractAddress, slot));
151
+ async getCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string, scope: AztecAddress): Promise<Fr[] | null> {
152
+ const dataBuffer = await this.#getFromStage(jobId, dbSlotToKey(contractAddress, slot, scope));
152
153
  if (!dataBuffer) {
153
154
  this.logger.trace(`Data not found for contract ${contractAddress.toString()} and slot ${slot.toString()}`);
154
155
  return null;
@@ -165,9 +166,9 @@ export class CapsuleStore implements StagedStore {
165
166
  * @param contractAddress - The contract address under which the data is scoped.
166
167
  * @param slot - The slot in the database to delete.
167
168
  */
168
- deleteCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string) {
169
+ deleteCapsule(contractAddress: AztecAddress, slot: Fr, jobId: string, scope: AztecAddress) {
169
170
  // When we commit this, we will interpret null as a deletion, so we'll propagate the delete to the KV store
170
- this.#deleteOnStage(jobId, dbSlotToKey(contractAddress, slot));
171
+ this.#deleteOnStage(jobId, dbSlotToKey(contractAddress, slot, scope));
171
172
  }
172
173
 
173
174
  /**
@@ -187,6 +188,7 @@ export class CapsuleStore implements StagedStore {
187
188
  dstSlot: Fr,
188
189
  numEntries: number,
189
190
  jobId: string,
191
+ scope: AztecAddress,
190
192
  ): Promise<void> {
191
193
  // This transactional context gives us "copy atomicity":
192
194
  // there shouldn't be concurrent writes to what's being copied here.
@@ -203,8 +205,8 @@ export class CapsuleStore implements StagedStore {
203
205
  }
204
206
 
205
207
  for (const i of indexes) {
206
- const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)));
207
- const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)));
208
+ const currentSrcSlot = dbSlotToKey(contractAddress, srcSlot.add(new Fr(i)), scope);
209
+ const currentDstSlot = dbSlotToKey(contractAddress, dstSlot.add(new Fr(i)), scope);
208
210
 
209
211
  const toCopy = await this.#getFromStage(jobId, currentSrcSlot);
210
212
  if (!toCopy) {
@@ -224,7 +226,13 @@ export class CapsuleStore implements StagedStore {
224
226
  * @param baseSlot - The slot where the array length is stored
225
227
  * @param content - Array of capsule data to append
226
228
  */
227
- appendToCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][], jobId: string): Promise<void> {
229
+ appendToCapsuleArray(
230
+ contractAddress: AztecAddress,
231
+ baseSlot: Fr,
232
+ content: Fr[][],
233
+ jobId: string,
234
+ scope: AztecAddress,
235
+ ): Promise<void> {
228
236
  // We wrap this in a transaction to serialize concurrent calls from Promise.all.
229
237
  // Without this, concurrent appends to the same array could race: both read length=0,
230
238
  // both write at the same slots, one overwrites the other.
@@ -232,22 +240,22 @@ export class CapsuleStore implements StagedStore {
232
240
  // and not using a transaction here would heavily impact performance.
233
241
  return this.#store.transactionAsync(async () => {
234
242
  // Load current length, defaulting to 0 if not found
235
- const lengthData = await this.loadCapsule(contractAddress, baseSlot, jobId);
243
+ const lengthData = await this.getCapsule(contractAddress, baseSlot, jobId, scope);
236
244
  const currentLength = lengthData ? lengthData[0].toNumber() : 0;
237
245
 
238
246
  // Store each capsule at consecutive slots after baseSlot + 1 + currentLength
239
247
  for (let i = 0; i < content.length; i++) {
240
248
  const nextSlot = arraySlot(baseSlot, currentLength + i);
241
- this.storeCapsule(contractAddress, nextSlot, content[i], jobId);
249
+ this.setCapsule(contractAddress, nextSlot, content[i], jobId, scope);
242
250
  }
243
251
 
244
252
  // Update length to include all new capsules
245
253
  const newLength = currentLength + content.length;
246
- this.storeCapsule(contractAddress, baseSlot, [new Fr(newLength)], jobId);
254
+ this.setCapsule(contractAddress, baseSlot, [new Fr(newLength)], jobId, scope);
247
255
  });
248
256
  }
249
257
 
250
- readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, jobId: string): Promise<Fr[][]> {
258
+ readCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, jobId: string, scope: AztecAddress): Promise<Fr[][]> {
251
259
  // I'm leaving this transactional context here though because I'm assuming this
252
260
  // gives us "read array atomicity": there shouldn't be concurrent writes to what's being copied
253
261
  // here.
@@ -255,14 +263,14 @@ export class CapsuleStore implements StagedStore {
255
263
  // of jobs: different calls running concurrently on the same contract may cause trouble.
256
264
  return this.#store.transactionAsync(async () => {
257
265
  // Load length, defaulting to 0 if not found
258
- const maybeLength = await this.loadCapsule(contractAddress, baseSlot, jobId);
266
+ const maybeLength = await this.getCapsule(contractAddress, baseSlot, jobId, scope);
259
267
  const length = maybeLength ? maybeLength[0].toBigInt() : 0n;
260
268
 
261
269
  const values: Fr[][] = [];
262
270
 
263
271
  // Read each capsule at consecutive slots after baseSlot
264
272
  for (let i = 0; i < length; i++) {
265
- const currentValue = await this.loadCapsule(contractAddress, arraySlot(baseSlot, i), jobId);
273
+ const currentValue = await this.getCapsule(contractAddress, arraySlot(baseSlot, i), jobId, scope);
266
274
  if (currentValue == undefined) {
267
275
  throw new Error(
268
276
  `Expected non-empty value at capsule array in base slot ${baseSlot} at index ${i} for contract ${contractAddress}`,
@@ -276,7 +284,7 @@ export class CapsuleStore implements StagedStore {
276
284
  });
277
285
  }
278
286
 
279
- setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][], jobId: string) {
287
+ setCapsuleArray(contractAddress: AztecAddress, baseSlot: Fr, content: Fr[][], jobId: string, scope: AztecAddress) {
280
288
  // This transactional context in theory isn't so critical now because we aren't
281
289
  // writing to DB so if there's exceptions midway and it blows up, no visible impact
282
290
  // to persistent storage will happen.
@@ -287,27 +295,27 @@ export class CapsuleStore implements StagedStore {
287
295
  // of jobs: different calls running concurrently on the same contract may cause trouble.
288
296
  return this.#store.transactionAsync(async () => {
289
297
  // Load current length, defaulting to 0 if not found
290
- const maybeLength = await this.loadCapsule(contractAddress, baseSlot, jobId);
298
+ const maybeLength = await this.getCapsule(contractAddress, baseSlot, jobId, scope);
291
299
  const originalLength = maybeLength ? maybeLength[0].toNumber() : 0;
292
300
 
293
301
  // Set the new length
294
- this.storeCapsule(contractAddress, baseSlot, [new Fr(content.length)], jobId);
302
+ this.setCapsule(contractAddress, baseSlot, [new Fr(content.length)], jobId, scope);
295
303
 
296
304
  // Store the new content, possibly overwriting existing values
297
305
  for (let i = 0; i < content.length; i++) {
298
- this.storeCapsule(contractAddress, arraySlot(baseSlot, i), content[i], jobId);
306
+ this.setCapsule(contractAddress, arraySlot(baseSlot, i), content[i], jobId, scope);
299
307
  }
300
308
 
301
309
  // Clear any stragglers
302
310
  for (let i = content.length; i < originalLength; i++) {
303
- this.deleteCapsule(contractAddress, arraySlot(baseSlot, i), jobId);
311
+ this.deleteCapsule(contractAddress, arraySlot(baseSlot, i), jobId, scope);
304
312
  }
305
313
  });
306
314
  }
307
315
  }
308
316
 
309
- function dbSlotToKey(contractAddress: AztecAddress, slot: Fr): string {
310
- return `${contractAddress.toString()}:${slot.toString()}`;
317
+ function dbSlotToKey(contractAddress: AztecAddress, slot: Fr, scope: AztecAddress): string {
318
+ return [contractAddress.toString(), scope.toString(), slot.toString()].join(':');
311
319
  }
312
320
 
313
321
  function arraySlot(baseSlot: Fr, index: number) {
@@ -1 +1,2 @@
1
+ export { CapsuleService } from './capsule_service.js';
1
2
  export { CapsuleStore } from './capsule_store.js';
@@ -1 +1 @@
1
- export const PXE_DATA_SCHEMA_VERSION = 4;
1
+ export const PXE_DATA_SCHEMA_VERSION = 5;
@@ -106,7 +106,7 @@ export class NoteStore implements StagedStore {
106
106
  * returned once if this is the case)
107
107
  */
108
108
  getNotes(filter: NotesFilter, jobId: string): Promise<NoteDao[]> {
109
- if (filter.scopes !== 'ALL_SCOPES' && filter.scopes.length === 0) {
109
+ if (filter.scopes.length === 0) {
110
110
  return Promise.resolve([]);
111
111
  }
112
112
 
@@ -180,10 +180,7 @@ export class NoteStore implements StagedStore {
180
180
  continue;
181
181
  }
182
182
 
183
- if (
184
- filter.scopes !== 'ALL_SCOPES' &&
185
- note.scopes.intersection(new Set(filter.scopes.map(s => s.toString()))).size === 0
186
- ) {
183
+ if (note.scopes.intersection(new Set(filter.scopes.map(s => s.toString()))).size === 0) {
187
184
  continue;
188
185
  }
189
186
 
@@ -1,9 +0,0 @@
1
- import type { AztecAddress } from '@aztec/stdlib/aztec-address';
2
- /**
3
- * Controls which accounts' private state and keys are accessible during execution.
4
- * - `'ALL_SCOPES'`: All registered accounts' private state and keys are accessible.
5
- * - `AztecAddress[]` with entries: Only the specified accounts' private state and keys are accessible.
6
- * - `[]` (empty array): Deny-all. No private state is visible and no keys are accessible.
7
- */
8
- export type AccessScopes = 'ALL_SCOPES' | AztecAddress[];
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjZXNzX3Njb3Blcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2FjY2Vzc19zY29wZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFaEU7Ozs7O0dBS0c7QUFDSCxNQUFNLE1BQU0sWUFBWSxHQUFHLFlBQVksR0FBRyxZQUFZLEVBQUUsQ0FBQyJ9
@@ -1 +0,0 @@
1
- {"version":3,"file":"access_scopes.d.ts","sourceRoot":"","sources":["../src/access_scopes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,YAAY,EAAE,CAAC"}
@@ -1,6 +0,0 @@
1
- /**
2
- * Controls which accounts' private state and keys are accessible during execution.
3
- * - `'ALL_SCOPES'`: All registered accounts' private state and keys are accessible.
4
- * - `AztecAddress[]` with entries: Only the specified accounts' private state and keys are accessible.
5
- * - `[]` (empty array): Deny-all. No private state is visible and no keys are accessible.
6
- */ export { };
@@ -1,16 +0,0 @@
1
- import { Fr } from '@aztec/foundation/curves/bn254';
2
- import type { TxHash } from '@aztec/stdlib/tx';
3
- /**
4
- * Intermediate struct used to return resolved message contexts from PXE. The
5
- * `utilityResolveMessageContexts` oracle stores values of this type in a CapsuleArray.
6
- */
7
- export declare class MessageTxContext {
8
- txHash: TxHash;
9
- uniqueNoteHashesInTx: Fr[];
10
- firstNullifierInTx: Fr;
11
- constructor(txHash: TxHash, uniqueNoteHashesInTx: Fr[], firstNullifierInTx: Fr);
12
- toFields(): Fr[];
13
- static toEmptyFields(): Fr[];
14
- static toSerializedOption(response: MessageTxContext | null): Fr[];
15
- }
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZV90eF9jb250ZXh0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL25vaXItc3RydWN0cy9tZXNzYWdlX3R4X2NvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DOzs7R0FHRztBQUNILHFCQUFhLGdCQUFnQjtJQUVsQixNQUFNLEVBQUUsTUFBTTtJQUNkLG9CQUFvQixFQUFFLEVBQUUsRUFBRTtJQUMxQixrQkFBa0IsRUFBRSxFQUFFO0lBSC9CLFlBQ1MsTUFBTSxFQUFFLE1BQU0sRUFDZCxvQkFBb0IsRUFBRSxFQUFFLEVBQUUsRUFDMUIsa0JBQWtCLEVBQUUsRUFBRSxFQUMzQjtJQUVKLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FNZjtJQUVELE1BQU0sQ0FBQyxhQUFhLElBQUksRUFBRSxFQUFFLENBSTNCO0lBRUQsTUFBTSxDQUFDLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyxJQUFJLEdBQUcsRUFBRSxFQUFFLENBTWpFO0NBQ0YifQ==
@@ -1 +0,0 @@
1
- {"version":3,"file":"message_tx_context.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/noir-structs/message_tx_context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;GAGG;AACH,qBAAa,gBAAgB;IAElB,MAAM,EAAE,MAAM;IACd,oBAAoB,EAAE,EAAE,EAAE;IAC1B,kBAAkB,EAAE,EAAE;IAH/B,YACS,MAAM,EAAE,MAAM,EACd,oBAAoB,EAAE,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE,EAC3B;IAEJ,QAAQ,IAAI,EAAE,EAAE,CAMf;IAED,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,CAI3B;IAED,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,GAAG,EAAE,EAAE,CAMjE;CACF"}
@@ -1,57 +0,0 @@
1
- import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
2
- import { range } from '@aztec/foundation/array';
3
- import { Fr } from '@aztec/foundation/curves/bn254';
4
- /**
5
- * Intermediate struct used to return resolved message contexts from PXE. The
6
- * `utilityResolveMessageContexts` oracle stores values of this type in a CapsuleArray.
7
- */ export class MessageTxContext {
8
- txHash;
9
- uniqueNoteHashesInTx;
10
- firstNullifierInTx;
11
- constructor(txHash, uniqueNoteHashesInTx, firstNullifierInTx){
12
- this.txHash = txHash;
13
- this.uniqueNoteHashesInTx = uniqueNoteHashesInTx;
14
- this.firstNullifierInTx = firstNullifierInTx;
15
- }
16
- toFields() {
17
- return [
18
- this.txHash.hash,
19
- ...serializeBoundedVec(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
20
- this.firstNullifierInTx
21
- ];
22
- }
23
- static toEmptyFields() {
24
- const serializationLen = 1 /* txHash */ + MAX_NOTE_HASHES_PER_TX + 1 /* uniqueNoteHashesInTx BVec */ + 1; /* firstNullifierInTx */
25
- return range(serializationLen).map((_)=>Fr.zero());
26
- }
27
- static toSerializedOption(response) {
28
- if (response) {
29
- return [
30
- new Fr(1),
31
- ...response.toFields()
32
- ];
33
- } else {
34
- return [
35
- new Fr(0),
36
- ...MessageTxContext.toEmptyFields()
37
- ];
38
- }
39
- }
40
- }
41
- /**
42
- * Helper function to serialize a bounded vector according to Noir's BoundedVec format
43
- * @param values - The values to serialize
44
- * @param maxLength - The maximum length of the bounded vector
45
- * @returns The serialized bounded vector as Fr[]
46
- */ function serializeBoundedVec(values, maxLength) {
47
- if (values.length > maxLength) {
48
- throw new Error(`Attempted to serialize ${values} values into a BoundedVec with max length ${maxLength}`);
49
- }
50
- const lengthDiff = maxLength - values.length;
51
- const zeroPaddingArray = Array(lengthDiff).fill(Fr.ZERO);
52
- const storage = values.concat(zeroPaddingArray);
53
- return [
54
- ...storage,
55
- new Fr(values.length)
56
- ];
57
- }
@@ -1,9 +0,0 @@
1
- import type { AztecAddress } from '@aztec/stdlib/aztec-address';
2
-
3
- /**
4
- * Controls which accounts' private state and keys are accessible during execution.
5
- * - `'ALL_SCOPES'`: All registered accounts' private state and keys are accessible.
6
- * - `AztecAddress[]` with entries: Only the specified accounts' private state and keys are accessible.
7
- * - `[]` (empty array): Deny-all. No private state is visible and no keys are accessible.
8
- */
9
- export type AccessScopes = 'ALL_SCOPES' | AztecAddress[];
@@ -1,55 +0,0 @@
1
- import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
2
- import { range } from '@aztec/foundation/array';
3
- import { Fr } from '@aztec/foundation/curves/bn254';
4
- import type { TxHash } from '@aztec/stdlib/tx';
5
-
6
- /**
7
- * Intermediate struct used to return resolved message contexts from PXE. The
8
- * `utilityResolveMessageContexts` oracle stores values of this type in a CapsuleArray.
9
- */
10
- export class MessageTxContext {
11
- constructor(
12
- public txHash: TxHash,
13
- public uniqueNoteHashesInTx: Fr[],
14
- public firstNullifierInTx: Fr,
15
- ) {}
16
-
17
- toFields(): Fr[] {
18
- return [
19
- this.txHash.hash,
20
- ...serializeBoundedVec(this.uniqueNoteHashesInTx, MAX_NOTE_HASHES_PER_TX),
21
- this.firstNullifierInTx,
22
- ];
23
- }
24
-
25
- static toEmptyFields(): Fr[] {
26
- const serializationLen =
27
- 1 /* txHash */ + MAX_NOTE_HASHES_PER_TX + 1 /* uniqueNoteHashesInTx BVec */ + 1; /* firstNullifierInTx */
28
- return range(serializationLen).map(_ => Fr.zero());
29
- }
30
-
31
- static toSerializedOption(response: MessageTxContext | null): Fr[] {
32
- if (response) {
33
- return [new Fr(1), ...response.toFields()];
34
- } else {
35
- return [new Fr(0), ...MessageTxContext.toEmptyFields()];
36
- }
37
- }
38
- }
39
-
40
- /**
41
- * Helper function to serialize a bounded vector according to Noir's BoundedVec format
42
- * @param values - The values to serialize
43
- * @param maxLength - The maximum length of the bounded vector
44
- * @returns The serialized bounded vector as Fr[]
45
- */
46
- function serializeBoundedVec(values: Fr[], maxLength: number): Fr[] {
47
- if (values.length > maxLength) {
48
- throw new Error(`Attempted to serialize ${values} values into a BoundedVec with max length ${maxLength}`);
49
- }
50
-
51
- const lengthDiff = maxLength - values.length;
52
- const zeroPaddingArray = Array(lengthDiff).fill(Fr.ZERO);
53
- const storage = values.concat(zeroPaddingArray);
54
- return [...storage, new Fr(values.length)];
55
- }