@aztec/pxe 0.0.1-commit.f295ac2 → 0.0.1-commit.fc805bf
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.
- package/dest/bin/check_oracle_version.js +1 -1
- package/dest/block_synchronizer/block_synchronizer.d.ts +7 -5
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +56 -16
- package/dest/config/index.d.ts +3 -1
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +17 -0
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +2 -4
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +8 -13
- package/dest/contract_function_simulator/index.d.ts +2 -2
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +1 -1
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +13 -10
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts +4 -4
- package/dest/contract_function_simulator/oracle/note_packing_utils.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/note_packing_utils.js +4 -4
- package/dest/contract_function_simulator/oracle/oracle.d.ts +6 -4
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +33 -23
- package/dest/contract_function_simulator/oracle/private_execution.d.ts +2 -22
- package/dest/contract_function_simulator/oracle/private_execution.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution.js +0 -37
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +10 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +19 -8
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +29 -17
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +47 -45
- package/dest/contract_sync/index.d.ts +23 -0
- package/dest/contract_sync/index.d.ts.map +1 -0
- package/dest/contract_sync/index.js +54 -0
- package/dest/debug/pxe_debug_utils.d.ts +16 -6
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +20 -10
- package/dest/entrypoints/client/bundle/utils.d.ts +1 -1
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +12 -6
- package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +13 -7
- package/dest/entrypoints/pxe_creation_options.d.ts +3 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/server/index.d.ts +2 -1
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +1 -0
- package/dest/entrypoints/server/utils.d.ts +1 -1
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +19 -8
- package/dest/events/event_service.d.ts +5 -6
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +6 -7
- package/dest/job_coordinator/job_coordinator.d.ts +3 -2
- package/dest/job_coordinator/job_coordinator.d.ts.map +1 -1
- package/dest/job_coordinator/job_coordinator.js +3 -2
- package/dest/logs/log_service.d.ts +5 -4
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +18 -15
- package/dest/notes/note_service.d.ts +6 -6
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +14 -14
- package/dest/oracle_version.d.ts +3 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +4 -3
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +3 -2
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +2 -2
- package/dest/private_kernel/private_kernel_oracle.d.ts +3 -3
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/pxe.d.ts +1 -1
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +19 -15
- package/dest/storage/address_store/address_store.d.ts +1 -1
- package/dest/storage/address_store/address_store.d.ts.map +1 -1
- package/dest/storage/address_store/address_store.js +12 -11
- package/dest/storage/anchor_block_store/anchor_block_store.d.ts +9 -1
- package/dest/storage/anchor_block_store/anchor_block_store.d.ts.map +1 -1
- package/dest/storage/anchor_block_store/anchor_block_store.js +8 -1
- package/dest/storage/capsule_store/capsule_store.js +6 -8
- package/dest/storage/contract_store/contract_store.d.ts +1 -2
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +22 -25
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +48 -50
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +276 -252
- package/dest/storage/note_store/stored_note.d.ts +16 -0
- package/dest/storage/note_store/stored_note.d.ts.map +1 -0
- package/dest/storage/note_store/stored_note.js +43 -0
- package/dest/storage/private_event_store/private_event_store.d.ts +17 -4
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +198 -147
- package/dest/storage/private_event_store/stored_private_event.d.ts +23 -0
- package/dest/storage/private_event_store/stored_private_event.d.ts.map +1 -0
- package/dest/storage/private_event_store/stored_private_event.js +56 -0
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts +1 -1
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/recipient_tagging_store.js +31 -19
- package/dest/storage/tagging_store/sender_address_book_store.d.ts +1 -1
- package/dest/storage/tagging_store/sender_address_book_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_address_book_store.js +20 -14
- package/dest/storage/tagging_store/sender_tagging_store.d.ts +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +183 -113
- package/dest/tagging/get_all_logs_by_tags.d.ts +24 -0
- package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -0
- package/dest/tagging/get_all_logs_by_tags.js +46 -0
- package/dest/tagging/index.d.ts +2 -1
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +1 -0
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +3 -2
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +2 -2
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +3 -2
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +5 -2
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +3 -2
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +2 -2
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +1 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +5 -8
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +3 -2
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +7 -4
- package/package.json +16 -16
- package/src/bin/check_oracle_version.ts +1 -0
- package/src/block_synchronizer/block_synchronizer.ts +70 -33
- package/src/config/index.ts +14 -0
- package/src/contract_function_simulator/contract_function_simulator.ts +7 -15
- package/src/contract_function_simulator/index.ts +1 -1
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +1 -1
- package/src/contract_function_simulator/oracle/interfaces.ts +18 -9
- package/src/contract_function_simulator/oracle/note_packing_utils.ts +4 -4
- package/src/contract_function_simulator/oracle/oracle.ts +48 -25
- package/src/contract_function_simulator/oracle/private_execution.ts +1 -60
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +32 -10
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +67 -53
- package/src/contract_sync/index.ts +98 -0
- package/src/debug/pxe_debug_utils.ts +26 -11
- package/src/entrypoints/client/bundle/utils.ts +7 -14
- package/src/entrypoints/client/lazy/utils.ts +8 -14
- package/src/entrypoints/pxe_creation_options.ts +2 -1
- package/src/entrypoints/server/index.ts +1 -0
- package/src/entrypoints/server/utils.ts +15 -19
- package/src/events/event_service.ts +5 -7
- package/src/job_coordinator/job_coordinator.ts +4 -3
- package/src/logs/log_service.ts +29 -13
- package/src/notes/note_service.ts +21 -20
- package/src/oracle_version.ts +4 -3
- package/src/private_kernel/private_kernel_execution_prover.ts +6 -3
- package/src/private_kernel/private_kernel_oracle.ts +2 -2
- package/src/pxe.ts +48 -17
- package/src/storage/address_store/address_store.ts +15 -15
- package/src/storage/anchor_block_store/anchor_block_store.ts +8 -0
- package/src/storage/capsule_store/capsule_store.ts +8 -8
- package/src/storage/contract_store/contract_store.ts +22 -31
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +314 -318
- package/src/storage/note_store/stored_note.ts +48 -0
- package/src/storage/private_event_store/private_event_store.ts +250 -190
- package/src/storage/private_event_store/stored_private_event.ts +73 -0
- package/src/storage/tagging_store/recipient_tagging_store.ts +31 -21
- package/src/storage/tagging_store/sender_address_book_store.ts +20 -14
- package/src/storage/tagging_store/sender_tagging_store.ts +210 -126
- package/src/tagging/get_all_logs_by_tags.ts +68 -0
- package/src/tagging/index.ts +1 -0
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +11 -1
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +7 -1
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +3 -1
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +5 -17
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +12 -3
- package/dest/tree_membership/tree_membership_service.d.ts +0 -50
- package/dest/tree_membership/tree_membership_service.d.ts.map +0 -1
- package/dest/tree_membership/tree_membership_service.js +0 -75
- package/src/tree_membership/tree_membership_service.ts +0 -97
|
@@ -30,7 +30,11 @@
|
|
|
30
30
|
return highestAgedIndexForJob;
|
|
31
31
|
}
|
|
32
32
|
async #readHighestAgedIndex(jobId, secret) {
|
|
33
|
-
|
|
33
|
+
// Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
|
|
34
|
+
// are no pending read requests). The staged value still takes precedence if it exists.
|
|
35
|
+
const dbValue = await this.#highestAgedIndex.getAsync(secret);
|
|
36
|
+
const staged = this.#getHighestAgedIndexForJob(jobId).get(secret);
|
|
37
|
+
return staged ?? dbValue;
|
|
34
38
|
}
|
|
35
39
|
#writeHighestAgedIndex(jobId, secret, index) {
|
|
36
40
|
this.#getHighestAgedIndexForJob(jobId).set(secret, index);
|
|
@@ -44,7 +48,11 @@
|
|
|
44
48
|
return jobStagedHighestFinalizedIndex;
|
|
45
49
|
}
|
|
46
50
|
async #readHighestFinalizedIndex(jobId, secret) {
|
|
47
|
-
|
|
51
|
+
// Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
|
|
52
|
+
// are no pending read requests). The staged value still takes precedence if it exists.
|
|
53
|
+
const dbValue = await this.#highestFinalizedIndex.getAsync(secret);
|
|
54
|
+
const staged = this.#getHighestFinalizedIndexForJob(jobId).get(secret);
|
|
55
|
+
return staged ?? dbValue;
|
|
48
56
|
}
|
|
49
57
|
#writeHighestFinalizedIndex(jobId, secret, index) {
|
|
50
58
|
this.#getHighestFinalizedIndexForJob(jobId).set(secret, index);
|
|
@@ -74,26 +82,30 @@
|
|
|
74
82
|
return Promise.resolve();
|
|
75
83
|
}
|
|
76
84
|
getHighestAgedIndex(secret, jobId) {
|
|
77
|
-
return this.#readHighestAgedIndex(jobId, secret.toString());
|
|
85
|
+
return this.#store.transactionAsync(()=>this.#readHighestAgedIndex(jobId, secret.toString()));
|
|
78
86
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
87
|
+
updateHighestAgedIndex(secret, index, jobId) {
|
|
88
|
+
return this.#store.transactionAsync(async ()=>{
|
|
89
|
+
const currentIndex = await this.#readHighestAgedIndex(jobId, secret.toString());
|
|
90
|
+
if (currentIndex !== undefined && index <= currentIndex) {
|
|
91
|
+
// Log sync should never set a lower highest aged index.
|
|
92
|
+
throw new Error(`New highest aged index (${index}) must be higher than the current one (${currentIndex})`);
|
|
93
|
+
}
|
|
94
|
+
this.#writeHighestAgedIndex(jobId, secret.toString(), index);
|
|
95
|
+
});
|
|
86
96
|
}
|
|
87
97
|
getHighestFinalizedIndex(secret, jobId) {
|
|
88
|
-
return this.#readHighestFinalizedIndex(jobId, secret.toString());
|
|
98
|
+
return this.#store.transactionAsync(()=>this.#readHighestFinalizedIndex(jobId, secret.toString()));
|
|
89
99
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
100
|
+
updateHighestFinalizedIndex(secret, index, jobId) {
|
|
101
|
+
return this.#store.transactionAsync(async ()=>{
|
|
102
|
+
const currentIndex = await this.#readHighestFinalizedIndex(jobId, secret.toString());
|
|
103
|
+
if (currentIndex !== undefined && index < currentIndex) {
|
|
104
|
+
// Log sync should never set a lower highest finalized index but it can happen that it would try to set the same
|
|
105
|
+
// one because we are loading logs from highest aged index + 1 and not from the highest finalized index.
|
|
106
|
+
throw new Error(`New highest finalized index (${index}) must be higher than the current one (${currentIndex})`);
|
|
107
|
+
}
|
|
108
|
+
this.#writeHighestFinalizedIndex(jobId, secret.toString(), index);
|
|
109
|
+
});
|
|
98
110
|
}
|
|
99
111
|
}
|
|
@@ -11,4 +11,4 @@ export declare class SenderAddressBookStore {
|
|
|
11
11
|
getSenders(): Promise<AztecAddress[]>;
|
|
12
12
|
removeSender(address: AztecAddress): Promise<boolean>;
|
|
13
13
|
}
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZGVyX2FkZHJlc3NfYm9va19zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0b3JhZ2UvdGFnZ2luZ19zdG9yZS9zZW5kZXJfYWRkcmVzc19ib29rX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRDs7O0dBR0c7QUFDSCxxQkFBYSxzQkFBc0I7O0lBSWpDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQUluQztJQUVELFNBQVMsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FVakQ7SUFFRCxVQUFVLElBQUksT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBSXBDO0lBRUQsWUFBWSxDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVVwRDtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender_address_book_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/sender_address_book_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;GAGG;AACH,qBAAa,sBAAsB;;IAIjC,YAAY,KAAK,EAAE,iBAAiB,EAInC;
|
|
1
|
+
{"version":3,"file":"sender_address_book_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/sender_address_book_store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;GAGG;AACH,qBAAa,sBAAsB;;IAIjC,YAAY,KAAK,EAAE,iBAAiB,EAInC;IAED,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAUjD;IAED,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAIpC;IAED,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAUpD;CACF"}
|
|
@@ -10,21 +10,27 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
|
10
10
|
this.#store = store;
|
|
11
11
|
this.#addressBook = this.#store.openMap('address_book');
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
13
|
+
addSender(address) {
|
|
14
|
+
return this.#store.transactionAsync(async ()=>{
|
|
15
|
+
if (await this.#addressBook.hasAsync(address.toString())) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
await this.#addressBook.set(address.toString(), true);
|
|
19
|
+
return true;
|
|
20
|
+
});
|
|
19
21
|
}
|
|
20
|
-
|
|
21
|
-
return
|
|
22
|
+
getSenders() {
|
|
23
|
+
return this.#store.transactionAsync(async ()=>{
|
|
24
|
+
return (await toArray(this.#addressBook.keysAsync())).map(AztecAddress.fromString);
|
|
25
|
+
});
|
|
22
26
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
removeSender(address) {
|
|
28
|
+
return this.#store.transactionAsync(async ()=>{
|
|
29
|
+
if (!await this.#addressBook.hasAsync(address.toString())) {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
await this.#addressBook.delete(address.toString());
|
|
33
|
+
return true;
|
|
34
|
+
});
|
|
29
35
|
}
|
|
30
36
|
}
|
|
@@ -74,4 +74,4 @@ export declare class SenderTaggingStore implements StagedStore {
|
|
|
74
74
|
*/
|
|
75
75
|
finalizePendingIndexes(txHashes: TxHash[], jobId: string): Promise<void>;
|
|
76
76
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VuZGVyX3RhZ2dpbmdfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zdG9yYWdlL3RhZ2dpbmdfc3RvcmUvc2VuZGVyX3RhZ2dpbmdfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFDeEUsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTFDLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBDQUEwQyxDQUFDO0FBRzVFOzs7O0dBSUc7QUFDSCxxQkFBYSxrQkFBbUIsWUFBVyxXQUFXOztJQUNwRCxRQUFRLENBQUMsU0FBUyxvQkFBb0I7SUE2QnRDLFlBQVksS0FBSyxFQUFFLGlCQUFpQixFQVFuQztJQTRDRDs7OztPQUlHO0lBQ0csTUFBTSxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQW9CekM7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBSTFDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztPQXFCRztJQUNILG1CQUFtQixDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTBFbkY7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILDJCQUEyQixDQUN6QixNQUFNLEVBQUUsMkJBQTJCLEVBQ25DLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLEtBQUssRUFBRSxNQUFNLEdBQ1osT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBUW5CO0lBRUQ7Ozs7T0FJRztJQUNILHFCQUFxQixDQUFDLE1BQU0sRUFBRSwyQkFBMkIsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXJHO0lBRUQ7Ozs7O09BS0c7SUFDSCxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsMkJBQTJCLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQWtCaEc7SUFFRDs7T0FFRztJQUNILGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxLQUFLLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0EyQ25FO0lBRUQ7OztPQUdHO0lBQ0gsc0JBQXNCLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQTJGdkU7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sender_tagging_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/sender_tagging_store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sender_tagging_store.d.ts","sourceRoot":"","sources":["../../../src/storage/tagging_store/sender_tagging_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AAG5E;;;;GAIG;AACH,qBAAa,kBAAmB,YAAW,WAAW;;IACpD,QAAQ,CAAC,SAAS,oBAAoB;IA6BtC,YAAY,KAAK,EAAE,iBAAiB,EAQnC;IA4CD;;;;OAIG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBzC;IAED,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI1C;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0EnF;IAED;;;;;;;;OAQG;IACH,2BAA2B,CACzB,MAAM,EAAE,2BAA2B,EACnC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAQnB;IAED;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErG;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkBhG;IAED;;OAEG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CnE;IAED;;;OAGG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2FvE;CACF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { toArray } from '@aztec/foundation/iterable';
|
|
2
1
|
import { TxHash } from '@aztec/stdlib/tx';
|
|
3
2
|
import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.js';
|
|
4
3
|
/**
|
|
@@ -53,27 +52,21 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
|
|
|
53
52
|
return jobStagedLastFinalizedIndexes;
|
|
54
53
|
}
|
|
55
54
|
async #readPendingIndexes(jobId, secret) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
return
|
|
55
|
+
// Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
|
|
56
|
+
// are no pending read requests). The staged value still takes precedence if it exists.
|
|
57
|
+
const dbValue = await this.#pendingIndexes.getAsync(secret);
|
|
58
|
+
const staged = this.#getPendingIndexesForJob(jobId).get(secret);
|
|
59
|
+
return staged !== undefined ? staged : dbValue ?? [];
|
|
61
60
|
}
|
|
62
61
|
#writePendingIndexes(jobId, secret, pendingIndexes) {
|
|
63
62
|
this.#getPendingIndexesForJob(jobId).set(secret, pendingIndexes);
|
|
64
63
|
}
|
|
65
|
-
/**
|
|
66
|
-
* Returns a job view of all the secrets that have a corresponding list of pending indexes either in persistent
|
|
67
|
-
* storage or the current job.
|
|
68
|
-
*/ async #readSecretsWithPendingIndexes(jobId) {
|
|
69
|
-
const storedSecrets = new Set(await toArray(this.#pendingIndexes.keysAsync()));
|
|
70
|
-
const stagedSecrets = this.#getPendingIndexesForJob(jobId).keys();
|
|
71
|
-
return [
|
|
72
|
-
...storedSecrets.union(new Set(stagedSecrets))
|
|
73
|
-
];
|
|
74
|
-
}
|
|
75
64
|
async #readLastFinalizedIndex(jobId, secret) {
|
|
76
|
-
|
|
65
|
+
// Always issue DB read to keep IndexedDB transaction alive (they auto-commit when a new micro-task starts and there
|
|
66
|
+
// are no pending read requests). The staged value still takes precedence if it exists.
|
|
67
|
+
const dbValue = await this.#lastFinalizedIndexes.getAsync(secret);
|
|
68
|
+
const staged = this.#getLastFinalizedIndexesForJob(jobId).get(secret);
|
|
69
|
+
return staged ?? dbValue;
|
|
77
70
|
}
|
|
78
71
|
#writeLastFinalizedIndex(jobId, secret, lastFinalizedIndex) {
|
|
79
72
|
this.#getLastFinalizedIndexesForJob(jobId).set(secret, lastFinalizedIndex);
|
|
@@ -127,49 +120,68 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
|
|
|
127
120
|
* @throws If the newly stored pending index is lower than or equal to the last finalized index for the same secret.
|
|
128
121
|
* This is enforced because this should never happen if the syncing is done correctly as we look for logs from higher
|
|
129
122
|
* indexes than finalized ones.
|
|
130
|
-
*/
|
|
123
|
+
*/ storePendingIndexes(preTags, txHash, jobId) {
|
|
124
|
+
if (preTags.length === 0) {
|
|
125
|
+
return Promise.resolve();
|
|
126
|
+
}
|
|
131
127
|
// The secrets in pre-tags should be unique because we always store just the highest index per given secret-txHash
|
|
132
128
|
// pair. Below we check that this is the case.
|
|
133
129
|
const secretsSet = new Set(preTags.map((preTag)=>preTag.secret.toString()));
|
|
134
130
|
if (secretsSet.size !== preTags.length) {
|
|
135
|
-
|
|
131
|
+
return Promise.reject(new Error(`Duplicate secrets found when storing pending indexes`));
|
|
136
132
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
//
|
|
140
|
-
const
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
133
|
+
const txHashStr = txHash.toString();
|
|
134
|
+
return this.#store.transactionAsync(async ()=>{
|
|
135
|
+
// Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
|
|
136
|
+
const preTagReadPromises = preTags.map(({ secret, index })=>{
|
|
137
|
+
const secretStr = secret.toString();
|
|
138
|
+
return {
|
|
139
|
+
secret,
|
|
140
|
+
secretStr,
|
|
141
|
+
index,
|
|
142
|
+
pending: this.#readPendingIndexes(jobId, secretStr),
|
|
143
|
+
finalized: this.#readLastFinalizedIndex(jobId, secretStr)
|
|
144
|
+
};
|
|
145
|
+
});
|
|
146
|
+
// Await all reads together
|
|
147
|
+
const preTagData = await Promise.all(preTagReadPromises.map(async (item)=>({
|
|
148
|
+
...item,
|
|
149
|
+
pendingData: await item.pending,
|
|
150
|
+
finalizedIndex: await item.finalized
|
|
151
|
+
})));
|
|
152
|
+
// Process in memory and validate
|
|
153
|
+
for (const { secretStr, index, pendingData, finalizedIndex } of preTagData){
|
|
154
|
+
// First we check that for any secret the highest used index in tx is not further than window length from
|
|
155
|
+
// the highest finalized index.
|
|
156
|
+
if (index > (finalizedIndex ?? 0) + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN) {
|
|
157
|
+
throw new Error(`Highest used index ${index} is further than window length from the highest finalized index ${finalizedIndex ?? 0}.
|
|
158
|
+
Tagging window length ${UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN} is configured too low. Contact the Aztec team
|
|
159
|
+
to increase it!`);
|
|
160
|
+
}
|
|
161
|
+
// Throw if the new pending index is lower than or equal to the last finalized index
|
|
162
|
+
if (finalizedIndex !== undefined && index <= finalizedIndex) {
|
|
163
|
+
throw new Error(`Cannot store pending index ${index} for secret ${secretStr}: ` + `it is lower than or equal to the last finalized index ${finalizedIndex}`);
|
|
160
164
|
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
index,
|
|
168
|
-
txHash: txHashStr
|
|
165
|
+
// Check if this secret + txHash combination already exists
|
|
166
|
+
const existingForSecretAndTx = pendingData.find((entry)=>entry.txHash === txHashStr);
|
|
167
|
+
if (existingForSecretAndTx) {
|
|
168
|
+
// If it exists with a different index, throw an error
|
|
169
|
+
if (existingForSecretAndTx.index !== index) {
|
|
170
|
+
throw new Error(`Cannot store index ${index} for secret ${secretStr} and txHash ${txHashStr}: ` + `a different index ${existingForSecretAndTx.index} already exists for this secret-txHash pair`);
|
|
169
171
|
}
|
|
170
|
-
|
|
172
|
+
// If it exists with the same index, ignore the update (no-op)
|
|
173
|
+
} else {
|
|
174
|
+
// If it doesn't exist, add it
|
|
175
|
+
this.#writePendingIndexes(jobId, secretStr, [
|
|
176
|
+
...pendingData,
|
|
177
|
+
{
|
|
178
|
+
index,
|
|
179
|
+
txHash: txHashStr
|
|
180
|
+
}
|
|
181
|
+
]);
|
|
182
|
+
}
|
|
171
183
|
}
|
|
172
|
-
}
|
|
184
|
+
});
|
|
173
185
|
}
|
|
174
186
|
/**
|
|
175
187
|
* Returns the transaction hashes of all pending transactions that contain indexes within a specified range
|
|
@@ -179,100 +191,158 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
|
|
|
179
191
|
* @param endIndex - The upper bound of the index range (exclusive).
|
|
180
192
|
* @returns An array of unique transaction hashes for pending transactions that contain indexes in the range
|
|
181
193
|
* [startIndex, endIndex). Returns an empty array if no pending indexes exist in the range.
|
|
182
|
-
*/
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
194
|
+
*/ getTxHashesOfPendingIndexes(secret, startIndex, endIndex, jobId) {
|
|
195
|
+
return this.#store.transactionAsync(async ()=>{
|
|
196
|
+
const existing = await this.#readPendingIndexes(jobId, secret.toString());
|
|
197
|
+
const txHashes = existing.filter((entry)=>entry.index >= startIndex && entry.index < endIndex).map((entry)=>entry.txHash);
|
|
198
|
+
return Array.from(new Set(txHashes)).map(TxHash.fromString);
|
|
199
|
+
});
|
|
186
200
|
}
|
|
187
201
|
/**
|
|
188
202
|
* Returns the last (highest) finalized index for a given secret.
|
|
189
203
|
* @param secret - The secret to get the last finalized index for.
|
|
190
204
|
* @returns The last (highest) finalized index for the given secret.
|
|
191
205
|
*/ getLastFinalizedIndex(secret, jobId) {
|
|
192
|
-
return this.#readLastFinalizedIndex(jobId, secret.toString());
|
|
206
|
+
return this.#store.transactionAsync(()=>this.#readLastFinalizedIndex(jobId, secret.toString()));
|
|
193
207
|
}
|
|
194
208
|
/**
|
|
195
209
|
* Returns the last used index for a given directional app tagging secret, considering both finalized and pending
|
|
196
210
|
* indexes.
|
|
197
211
|
* @param secret - The directional app tagging secret to query the last used index for.
|
|
198
212
|
* @returns The last used index.
|
|
199
|
-
*/
|
|
213
|
+
*/ getLastUsedIndex(secret, jobId) {
|
|
200
214
|
const secretStr = secret.toString();
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
215
|
+
return this.#store.transactionAsync(async ()=>{
|
|
216
|
+
const pendingPromise = this.#readPendingIndexes(jobId, secretStr);
|
|
217
|
+
const finalizedPromise = this.#readLastFinalizedIndex(jobId, secretStr);
|
|
218
|
+
const [pendingTxScopedIndexes, lastFinalized] = await Promise.all([
|
|
219
|
+
pendingPromise,
|
|
220
|
+
finalizedPromise
|
|
221
|
+
]);
|
|
222
|
+
const pendingIndexes = pendingTxScopedIndexes.map((entry)=>entry.index);
|
|
223
|
+
if (pendingTxScopedIndexes.length === 0) {
|
|
224
|
+
return lastFinalized;
|
|
225
|
+
}
|
|
226
|
+
// As the last used index we return the highest one from the pending indexes. Note that this value will be always
|
|
227
|
+
// higher than the last finalized index because we prune lower pending indexes when a tx is finalized.
|
|
228
|
+
return Math.max(...pendingIndexes);
|
|
229
|
+
});
|
|
209
230
|
}
|
|
210
231
|
/**
|
|
211
232
|
* Drops all pending indexes corresponding to the given transaction hashes.
|
|
212
|
-
*/
|
|
233
|
+
*/ dropPendingIndexes(txHashes, jobId) {
|
|
213
234
|
if (txHashes.length === 0) {
|
|
214
|
-
return;
|
|
235
|
+
return Promise.resolve();
|
|
215
236
|
}
|
|
216
237
|
const txHashStrings = new Set(txHashes.map((txHash)=>txHash.toString()));
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
const
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
this.#
|
|
238
|
+
return this.#store.transactionAsync(async ()=>{
|
|
239
|
+
// Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
|
|
240
|
+
const secretReadPromises = new Map();
|
|
241
|
+
for await (const secret of this.#pendingIndexes.keysAsync()){
|
|
242
|
+
secretReadPromises.set(secret, this.#readPendingIndexes(jobId, secret));
|
|
243
|
+
}
|
|
244
|
+
// Add staged-only secrets (sync, no DB)
|
|
245
|
+
for (const secret of this.#getPendingIndexesForJob(jobId).keys()){
|
|
246
|
+
if (!secretReadPromises.has(secret)) {
|
|
247
|
+
secretReadPromises.set(secret, Promise.resolve(this.#getPendingIndexesForJob(jobId).get(secret) ?? []));
|
|
227
248
|
}
|
|
228
|
-
// else: No items were filtered out (txHashes not found for this secret) --> no-op
|
|
229
249
|
}
|
|
230
|
-
|
|
250
|
+
// Await all reads together
|
|
251
|
+
const secrets = [
|
|
252
|
+
...secretReadPromises.keys()
|
|
253
|
+
];
|
|
254
|
+
const pendingDataResults = await Promise.all(secretReadPromises.values());
|
|
255
|
+
// Process in memory
|
|
256
|
+
for(let i = 0; i < secrets.length; i++){
|
|
257
|
+
const secret = secrets[i];
|
|
258
|
+
const pendingData = pendingDataResults[i];
|
|
259
|
+
if (pendingData && pendingData.length > 0) {
|
|
260
|
+
const filtered = pendingData.filter((item)=>!txHashStrings.has(item.txHash));
|
|
261
|
+
if (filtered.length === 0) {
|
|
262
|
+
this.#writePendingIndexes(jobId, secret, []);
|
|
263
|
+
} else if (filtered.length !== pendingData.length) {
|
|
264
|
+
// Some items were filtered out, so update the pending data
|
|
265
|
+
this.#writePendingIndexes(jobId, secret, filtered);
|
|
266
|
+
}
|
|
267
|
+
// else: No items were filtered out (txHashes not found for this secret) --> no-op
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
});
|
|
231
271
|
}
|
|
232
272
|
/**
|
|
233
273
|
* Updates pending indexes corresponding to the given transaction hashes to be finalized and prunes any lower pending
|
|
234
274
|
* indexes.
|
|
235
|
-
*/
|
|
275
|
+
*/ finalizePendingIndexes(txHashes, jobId) {
|
|
236
276
|
if (txHashes.length === 0) {
|
|
237
|
-
return;
|
|
277
|
+
return Promise.resolve();
|
|
238
278
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
279
|
+
const txHashStrings = new Set(txHashes.map((tx)=>tx.toString()));
|
|
280
|
+
return this.#store.transactionAsync(async ()=>{
|
|
281
|
+
// Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
|
|
282
|
+
const secretDataPromises = new Map();
|
|
283
|
+
for await (const secret of this.#pendingIndexes.keysAsync()){
|
|
284
|
+
secretDataPromises.set(secret, {
|
|
285
|
+
pending: this.#readPendingIndexes(jobId, secret),
|
|
286
|
+
finalized: this.#readLastFinalizedIndex(jobId, secret)
|
|
287
|
+
});
|
|
288
|
+
}
|
|
289
|
+
// Add staged-only secrets (sync, no DB)
|
|
290
|
+
for (const secret of this.#getPendingIndexesForJob(jobId).keys()){
|
|
291
|
+
if (!secretDataPromises.has(secret)) {
|
|
292
|
+
secretDataPromises.set(secret, {
|
|
293
|
+
pending: Promise.resolve(this.#getPendingIndexesForJob(jobId).get(secret) ?? []),
|
|
294
|
+
finalized: Promise.resolve(this.#getLastFinalizedIndexesForJob(jobId).get(secret))
|
|
295
|
+
});
|
|
246
296
|
}
|
|
247
|
-
|
|
248
|
-
|
|
297
|
+
}
|
|
298
|
+
// Await all reads together
|
|
299
|
+
const secrets = [
|
|
300
|
+
...secretDataPromises.keys()
|
|
301
|
+
];
|
|
302
|
+
const dataResults = await Promise.all(secrets.map(async (secret)=>({
|
|
303
|
+
secret,
|
|
304
|
+
pendingData: await secretDataPromises.get(secret).pending,
|
|
305
|
+
lastFinalized: await secretDataPromises.get(secret).finalized
|
|
306
|
+
})));
|
|
307
|
+
// Process all txHashes for each secret in memory
|
|
308
|
+
for (const { secret, pendingData, lastFinalized } of dataResults){
|
|
309
|
+
if (!pendingData || pendingData.length === 0) {
|
|
249
310
|
continue;
|
|
250
311
|
}
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
312
|
+
let currentPending = pendingData;
|
|
313
|
+
let currentFinalized = lastFinalized;
|
|
314
|
+
// Process all txHashes for this secret
|
|
315
|
+
for (const txHashStr of txHashStrings){
|
|
316
|
+
const matchingIndexes = currentPending.filter((item)=>item.txHash === txHashStr).map((item)=>item.index);
|
|
317
|
+
if (matchingIndexes.length === 0) {
|
|
318
|
+
continue;
|
|
319
|
+
}
|
|
320
|
+
if (matchingIndexes.length > 1) {
|
|
321
|
+
// We should always just store the highest pending index for a given tx hash and secret because the lower
|
|
322
|
+
// values are irrelevant.
|
|
323
|
+
throw new Error(`Multiple pending indexes found for tx hash ${txHashStr} and secret ${secret}`);
|
|
324
|
+
}
|
|
325
|
+
const newFinalized = matchingIndexes[0];
|
|
326
|
+
if (newFinalized < (currentFinalized ?? 0)) {
|
|
327
|
+
// This should never happen because when last finalized index was finalized we should have pruned the lower
|
|
328
|
+
// pending indexes.
|
|
329
|
+
throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${currentFinalized}`);
|
|
330
|
+
}
|
|
331
|
+
currentFinalized = newFinalized;
|
|
332
|
+
// When we add pending indexes, we ensure they are higher than the last finalized index. However, because we
|
|
333
|
+
// cannot control the order in which transactions are finalized, there may be pending indexes that are now
|
|
334
|
+
// obsolete because they are lower than the most recently finalized index. For this reason, we prune these
|
|
335
|
+
// outdated pending indexes.
|
|
336
|
+
currentPending = currentPending.filter((item)=>item.index > currentFinalized);
|
|
255
337
|
}
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
// This should never happen because when last finalized index was finalized we should have pruned the lower
|
|
260
|
-
// pending indexes.
|
|
261
|
-
throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${lastFinalized}`);
|
|
338
|
+
// Write final state if changed
|
|
339
|
+
if (currentFinalized !== lastFinalized) {
|
|
340
|
+
this.#writeLastFinalizedIndex(jobId, secret, currentFinalized);
|
|
262
341
|
}
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
// When we add pending indexes, we ensure they are higher than the last finalized index. However, because we
|
|
266
|
-
// cannot control the order in which transactions are finalized, there may be pending indexes that are now
|
|
267
|
-
// obsolete because they are lower than the most recently finalized index. For this reason, we prune these
|
|
268
|
-
// outdated pending indexes.
|
|
269
|
-
const remainingItemsOfHigherIndex = pendingData.filter((item)=>item.index > (lastFinalized ?? 0));
|
|
270
|
-
if (remainingItemsOfHigherIndex.length === 0) {
|
|
271
|
-
this.#writePendingIndexes(jobId, secret, []);
|
|
272
|
-
} else {
|
|
273
|
-
this.#writePendingIndexes(jobId, secret, remainingItemsOfHigherIndex);
|
|
342
|
+
if (currentPending !== pendingData) {
|
|
343
|
+
this.#writePendingIndexes(jobId, secret, currentPending);
|
|
274
344
|
}
|
|
275
345
|
}
|
|
276
|
-
}
|
|
346
|
+
});
|
|
277
347
|
}
|
|
278
348
|
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
2
|
+
import type { BlockHash } from '@aztec/stdlib/block';
|
|
3
|
+
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
4
|
+
import type { SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
|
|
5
|
+
/**
|
|
6
|
+
* Fetches all private logs for the given tags, automatically paginating through all pages.
|
|
7
|
+
* @param aztecNode - The Aztec node to query.
|
|
8
|
+
* @param tags - The siloed tags to search for.
|
|
9
|
+
* @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
|
|
10
|
+
* because of reorgs).
|
|
11
|
+
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
12
|
+
*/
|
|
13
|
+
export declare function getAllPrivateLogsByTags(aztecNode: AztecNode, tags: SiloedTag[], anchorBlockHash: BlockHash): Promise<TxScopedL2Log[][]>;
|
|
14
|
+
/**
|
|
15
|
+
* Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
|
|
16
|
+
* @param aztecNode - The Aztec node to query.
|
|
17
|
+
* @param contractAddress - The contract address to search logs for.
|
|
18
|
+
* @param tags - The tags to search for.
|
|
19
|
+
* @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
|
|
20
|
+
* because of reorgs).
|
|
21
|
+
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
22
|
+
*/
|
|
23
|
+
export declare function getAllPublicLogsByTagsFromContract(aztecNode: AztecNode, contractAddress: AztecAddress, tags: Tag[], anchorBlockHash: BlockHash): Promise<TxScopedL2Log[][]>;
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2FsbF9sb2dzX2J5X3RhZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2dldF9hbGxfbG9nc19ieV90YWdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUE2QnhFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQ3JDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLElBQUksRUFBRSxTQUFTLEVBQUUsRUFDakIsZUFBZSxFQUFFLFNBQVMsR0FDekIsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FFNUI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FDaEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLGVBQWUsRUFBRSxTQUFTLEdBQ3pCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBSTVCIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get_all_logs_by_tags.d.ts","sourceRoot":"","sources":["../../src/tagging/get_all_logs_by_tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA6BxE;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EAAE,EACjB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAE5B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAI5B"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
|
|
2
|
+
/**
|
|
3
|
+
* Generic pagination helper that fetches all pages of results.
|
|
4
|
+
* @param numTags - The number of tags being queried (determines result array size).
|
|
5
|
+
* @param fetchPage - Function that fetches a single page of results given a page number.
|
|
6
|
+
* @returns An array of arrays, one per tag, containing all results across all pages.
|
|
7
|
+
*/ async function getAllPages(numTags, fetchPage) {
|
|
8
|
+
const allResultsPerTag = Array.from({
|
|
9
|
+
length: numTags
|
|
10
|
+
}, ()=>[]);
|
|
11
|
+
let page = 0;
|
|
12
|
+
let hasMore = true;
|
|
13
|
+
while(hasMore){
|
|
14
|
+
const resultsPage = await fetchPage(page);
|
|
15
|
+
hasMore = false;
|
|
16
|
+
for(let i = 0; i < resultsPage.length; i++){
|
|
17
|
+
allResultsPerTag[i].push(...resultsPage[i]);
|
|
18
|
+
if (resultsPage[i].length === MAX_LOGS_PER_TAG) {
|
|
19
|
+
hasMore = true;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
page++;
|
|
23
|
+
}
|
|
24
|
+
return allResultsPerTag;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Fetches all private logs for the given tags, automatically paginating through all pages.
|
|
28
|
+
* @param aztecNode - The Aztec node to query.
|
|
29
|
+
* @param tags - The siloed tags to search for.
|
|
30
|
+
* @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
|
|
31
|
+
* because of reorgs).
|
|
32
|
+
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
33
|
+
*/ export function getAllPrivateLogsByTags(aztecNode, tags, anchorBlockHash) {
|
|
34
|
+
return getAllPages(tags.length, (page)=>aztecNode.getPrivateLogsByTags(tags, page, anchorBlockHash));
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
|
|
38
|
+
* @param aztecNode - The Aztec node to query.
|
|
39
|
+
* @param contractAddress - The contract address to search logs for.
|
|
40
|
+
* @param tags - The tags to search for.
|
|
41
|
+
* @param anchorBlockHash - reference block for the Aztec node query, throws if block is not found there (typically
|
|
42
|
+
* because of reorgs).
|
|
43
|
+
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
44
|
+
*/ export function getAllPublicLogsByTagsFromContract(aztecNode, contractAddress, tags, anchorBlockHash) {
|
|
45
|
+
return getAllPages(tags.length, (page)=>aztecNode.getPublicLogsByTagsFromContract(contractAddress, tags, page, anchorBlockHash));
|
|
46
|
+
}
|
package/dest/tagging/index.d.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
export { loadPrivateLogsForSenderRecipientPair } from './recipient_sync/load_private_logs_for_sender_recipient_pair.js';
|
|
12
12
|
export { syncSenderTaggingIndexes } from './sender_sync/sync_sender_tagging_indexes.js';
|
|
13
13
|
export { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from './constants.js';
|
|
14
|
+
export { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract } from './get_all_logs_by_tags.js';
|
|
14
15
|
export { DirectionalAppTaggingSecret, Tag, SiloedTag } from '@aztec/stdlib/logs';
|
|
15
16
|
export { type PreTag } from '@aztec/stdlib/logs';
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7R0FTRztBQUVILE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLGlFQUFpRSxDQUFDO0FBQ3hILE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3hGLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxrQ0FBa0MsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3hHLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDakYsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUMifQ==
|