@aztec/pxe 0.0.1-commit.e6bd8901 → 0.0.1-commit.ec7ac5448
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 +4 -4
- package/dest/block_synchronizer/block_synchronizer.d.ts +5 -3
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +17 -5
- package/dest/config/index.d.ts +2 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +1 -1
- package/dest/config/package_info.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +60 -31
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +201 -74
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
- package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
- package/dest/contract_function_simulator/index.d.ts +2 -1
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +1 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +4 -6
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +8 -10
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +4 -7
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +6 -11
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +62 -46
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +75 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +310 -113
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +53 -79
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +109 -89
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +124 -67
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +326 -140
- package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
- package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
- package/dest/contract_function_simulator/pick_notes.js +9 -2
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +1 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.js +3 -0
- package/dest/contract_logging.d.ts +27 -0
- package/dest/contract_logging.d.ts.map +1 -0
- package/dest/contract_logging.js +38 -0
- package/dest/contract_sync/contract_sync_service.d.ts +44 -0
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -0
- package/dest/contract_sync/contract_sync_service.js +104 -0
- package/dest/contract_sync/helpers.d.ts +28 -0
- package/dest/contract_sync/helpers.d.ts.map +1 -0
- package/dest/contract_sync/{index.js → helpers.js} +20 -16
- package/dest/debug/pxe_debug_utils.d.ts +24 -10
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/debug/pxe_debug_utils.js +28 -18
- package/dest/entrypoints/client/bundle/index.d.ts +3 -1
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +2 -0
- package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +23 -9
- package/dest/entrypoints/client/lazy/index.d.ts +3 -1
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +2 -0
- package/dest/entrypoints/client/lazy/utils.d.ts +3 -3
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +24 -10
- package/dest/entrypoints/pxe_creation_options.d.ts +5 -2
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/pxe_creation_options.js +3 -1
- package/dest/entrypoints/server/index.d.ts +4 -3
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +3 -2
- package/dest/entrypoints/server/utils.d.ts +2 -2
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +30 -11
- package/dest/events/event_service.d.ts +5 -5
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +20 -9
- 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 +8 -9
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +38 -62
- package/dest/messages/message_context_service.d.ts +17 -0
- package/dest/messages/message_context_service.d.ts.map +1 -0
- package/dest/messages/message_context_service.js +36 -0
- package/dest/notes/note_service.d.ts +7 -8
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +23 -15
- package/dest/notes_filter.d.ts +24 -0
- package/dest/notes_filter.d.ts.map +1 -0
- package/dest/notes_filter.js +4 -0
- package/dest/oracle_version.d.ts +4 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +20 -10
- package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts +4 -0
- package/dest/private_kernel/hints/compute_tx_expiration_timestamp.d.ts.map +1 -0
- package/dest/private_kernel/hints/{compute_tx_include_by_timestamp.js → compute_tx_expiration_timestamp.js} +12 -12
- package/dest/private_kernel/hints/index.d.ts +1 -1
- package/dest/private_kernel/hints/index.js +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +4 -3
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +129 -68
- package/dest/private_kernel/hints/test_utils.d.ts +122 -0
- package/dest/private_kernel/hints/test_utils.d.ts.map +1 -0
- package/dest/private_kernel/hints/test_utils.js +203 -0
- 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 +21 -13
- package/dest/private_kernel/private_kernel_oracle.d.ts +8 -4
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +7 -3
- package/dest/pxe.d.ts +73 -24
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +131 -78
- 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_service.d.ts +21 -0
- package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
- package/dest/storage/capsule_store/capsule_service.js +50 -0
- package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
- package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
- package/dest/storage/capsule_store/capsule_store.js +39 -36
- package/dest/storage/capsule_store/index.d.ts +2 -1
- package/dest/storage/capsule_store/index.d.ts.map +1 -1
- package/dest/storage/capsule_store/index.js +1 -0
- package/dest/storage/contract_store/contract_store.d.ts +42 -15
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +157 -72
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +13 -3
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +147 -107
- package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +84 -61
- package/dest/storage/private_event_store/stored_private_event.d.ts +4 -4
- package/dest/storage/private_event_store/stored_private_event.d.ts.map +1 -1
- package/dest/storage/private_event_store/stored_private_event.js +2 -2
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
- 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 +29 -28
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +233 -137
- package/dest/tagging/get_all_logs_by_tags.d.ts +4 -4
- package/dest/tagging/get_all_logs_by_tags.d.ts.map +1 -1
- package/dest/tagging/get_all_logs_by_tags.js +17 -3
- package/dest/tagging/index.d.ts +3 -3
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +5 -6
- 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 +7 -7
- package/dest/tagging/recipient_sync/utils/find_highest_indexes.js +2 -2
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +7 -8
- 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 +12 -11
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +5 -9
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
- 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 +20 -10
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +6 -8
- 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 +36 -24
- package/package.json +25 -16
- package/src/bin/check_oracle_version.ts +4 -4
- package/src/block_synchronizer/block_synchronizer.ts +29 -19
- package/src/config/index.ts +1 -1
- package/src/config/package_info.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +360 -133
- package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
- package/src/contract_function_simulator/index.ts +1 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -9
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -10
- package/src/contract_function_simulator/oracle/interfaces.ts +90 -62
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
- package/src/contract_function_simulator/oracle/oracle.ts +391 -150
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +136 -187
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +544 -174
- package/src/contract_function_simulator/pick_notes.ts +9 -2
- package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
- package/src/contract_logging.ts +52 -0
- package/src/contract_sync/contract_sync_service.ts +170 -0
- package/src/contract_sync/{index.ts → helpers.ts} +23 -25
- package/src/debug/pxe_debug_utils.ts +63 -19
- package/src/entrypoints/client/bundle/index.ts +2 -0
- package/src/entrypoints/client/bundle/utils.ts +18 -18
- package/src/entrypoints/client/lazy/index.ts +2 -0
- package/src/entrypoints/client/lazy/utils.ts +19 -18
- package/src/entrypoints/pxe_creation_options.ts +9 -1
- package/src/entrypoints/server/index.ts +3 -2
- package/src/entrypoints/server/utils.ts +24 -29
- package/src/events/event_service.ts +21 -10
- package/src/job_coordinator/job_coordinator.ts +4 -3
- package/src/logs/log_service.ts +72 -106
- package/src/messages/message_context_service.ts +44 -0
- package/src/notes/note_service.ts +24 -16
- package/src/notes_filter.ts +24 -0
- package/src/oracle_version.ts +20 -10
- package/src/private_kernel/hints/{compute_tx_include_by_timestamp.ts → compute_tx_expiration_timestamp.ts} +13 -13
- package/src/private_kernel/hints/index.ts +1 -1
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +164 -117
- package/src/private_kernel/hints/test_utils.ts +325 -0
- package/src/private_kernel/private_kernel_execution_prover.ts +25 -15
- package/src/private_kernel/private_kernel_oracle.ts +9 -9
- package/src/pxe.ts +243 -131
- 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_service.ts +90 -0
- package/src/storage/capsule_store/capsule_store.ts +42 -34
- package/src/storage/capsule_store/index.ts +1 -0
- package/src/storage/contract_store/contract_store.ts +186 -76
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +166 -132
- package/src/storage/private_event_store/private_event_store.ts +102 -81
- package/src/storage/private_event_store/stored_private_event.ts +3 -3
- package/src/storage/tagging_store/recipient_tagging_store.ts +38 -24
- package/src/storage/tagging_store/sender_address_book_store.ts +20 -14
- package/src/storage/tagging_store/sender_tagging_store.ts +287 -156
- package/src/tagging/get_all_logs_by_tags.ts +31 -7
- package/src/tagging/index.ts +2 -2
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +9 -12
- package/src/tagging/recipient_sync/utils/find_highest_indexes.ts +2 -2
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +12 -17
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +25 -12
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +30 -29
- package/dest/contract_sync/index.d.ts +0 -23
- package/dest/contract_sync/index.d.ts.map +0 -1
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts +0 -4
- package/dest/private_kernel/hints/compute_tx_include_by_timestamp.d.ts.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ExtendedDirectionalAppTaggingSecret, SiloedTag } from '@aztec/stdlib/logs';
|
|
2
2
|
import { TxHash } from '@aztec/stdlib/tx';
|
|
3
3
|
import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.js';
|
|
4
4
|
/**
|
|
@@ -8,18 +8,17 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
|
|
|
8
8
|
*/ export class SenderTaggingStore {
|
|
9
9
|
storeName = 'sender_tagging';
|
|
10
10
|
#store;
|
|
11
|
-
// Stores the pending
|
|
12
|
-
// the private logs with tags corresponding to these indexes has not been finalized yet.
|
|
11
|
+
// Stores the pending index ranges for each directional app tagging secret. Pending here means that the tx that
|
|
12
|
+
// contained the private logs with tags corresponding to these indexes has not been finalized yet.
|
|
13
13
|
//
|
|
14
|
-
// We
|
|
15
|
-
//
|
|
16
|
-
//
|
|
14
|
+
// We store the full range (lowestIndex, highestIndex) for each secret-tx pair because transactions can partially
|
|
15
|
+
// revert, in which case only some logs (from the non-revertible phase) survive onchain. By storing the range,
|
|
16
|
+
// we can expand it and check each individual siloed tag against the TxEffect to determine which indexes made it
|
|
17
|
+
// onchain.
|
|
17
18
|
//
|
|
18
|
-
//
|
|
19
|
-
//
|
|
20
|
-
// directional app tagging secret => { pending index, txHash }[]
|
|
19
|
+
// directional app tagging secret => { lowestIndex, highestIndex, txHash }[]
|
|
21
20
|
#pendingIndexes;
|
|
22
|
-
// jobId => directional app tagging secret => {
|
|
21
|
+
// jobId => directional app tagging secret => { lowestIndex, highestIndex, txHash }[]
|
|
23
22
|
#pendingIndexesForJob;
|
|
24
23
|
// Stores the last (highest) finalized index for each directional app tagging secret. We care only about the last
|
|
25
24
|
// index because unlike the pending indexes, it will never happen that a finalized index would be removed and hence
|
|
@@ -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);
|
|
@@ -107,127 +100,185 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
|
|
|
107
100
|
return Promise.resolve();
|
|
108
101
|
}
|
|
109
102
|
/**
|
|
110
|
-
* Stores pending
|
|
111
|
-
* @remarks
|
|
112
|
-
*
|
|
113
|
-
*
|
|
114
|
-
* @param
|
|
115
|
-
* stored in the db.
|
|
116
|
-
* @param txHash - The tx in which the
|
|
103
|
+
* Stores pending index ranges.
|
|
104
|
+
* @remarks If the same (secret, txHash) pair already exists in the db with an equal range, it's a no-op. This is
|
|
105
|
+
* expected to happen because whenever we start sync we start from the last finalized index and we can have pending
|
|
106
|
+
* ranges already stored from previous syncs. If the ranges differ, it throws an error as that indicates a bug.
|
|
107
|
+
* @param ranges - The tagging index ranges containing the directional app tagging secrets and the index ranges that are
|
|
108
|
+
* to be stored in the db.
|
|
109
|
+
* @param txHash - The tx in which the tagging indexes were used in private logs.
|
|
117
110
|
* @param jobId - job context for staged writes to this store. See `JobCoordinator` for more details.
|
|
118
|
-
* @throws If
|
|
119
|
-
*
|
|
120
|
-
*
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
* @throws If a secret + txHash pair already exists in the db with a different index value. It should never happen
|
|
125
|
-
* that we would attempt to store a different index for a given secret-txHash pair because we always store just the
|
|
126
|
-
* highest index for a given secret-txHash pair. Hence this is a good way to catch bugs.
|
|
127
|
-
* @throws If the newly stored pending index is lower than or equal to the last finalized index for the same secret.
|
|
128
|
-
* This is enforced because this should never happen if the syncing is done correctly as we look for logs from higher
|
|
129
|
-
* indexes than finalized ones.
|
|
130
|
-
*/ async storePendingIndexes(preTags, txHash, jobId) {
|
|
131
|
-
// The secrets in pre-tags should be unique because we always store just the highest index per given secret-txHash
|
|
132
|
-
// pair. Below we check that this is the case.
|
|
133
|
-
const secretsSet = new Set(preTags.map((preTag)=>preTag.secret.toString()));
|
|
134
|
-
if (secretsSet.size !== preTags.length) {
|
|
135
|
-
throw new Error(`Duplicate secrets found when storing pending indexes`);
|
|
111
|
+
* @throws If the highestIndex is further than window length from the highest finalized index for the same secret.
|
|
112
|
+
* @throws If the lowestIndex is lower than or equal to the last finalized index for the same secret.
|
|
113
|
+
* @throws If a different range already exists for the same (secret, txHash) pair.
|
|
114
|
+
*/ storePendingIndexes(ranges, txHash, jobId) {
|
|
115
|
+
if (ranges.length === 0) {
|
|
116
|
+
return Promise.resolve();
|
|
136
117
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
//
|
|
140
|
-
const
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
//
|
|
147
|
-
const
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
//
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
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`);
|
|
118
|
+
const txHashStr = txHash.toString();
|
|
119
|
+
return this.#store.transactionAsync(async ()=>{
|
|
120
|
+
// Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
|
|
121
|
+
const rangeReadPromises = ranges.map((range)=>({
|
|
122
|
+
range,
|
|
123
|
+
secretStr: range.extendedSecret.toString(),
|
|
124
|
+
pending: this.#readPendingIndexes(jobId, range.extendedSecret.toString()),
|
|
125
|
+
finalized: this.#readLastFinalizedIndex(jobId, range.extendedSecret.toString())
|
|
126
|
+
}));
|
|
127
|
+
// Await all reads together
|
|
128
|
+
const rangeData = await Promise.all(rangeReadPromises.map(async (item)=>({
|
|
129
|
+
...item,
|
|
130
|
+
pendingData: await item.pending,
|
|
131
|
+
finalizedIndex: await item.finalized
|
|
132
|
+
})));
|
|
133
|
+
// Process in memory and validate
|
|
134
|
+
for (const { range, secretStr, pendingData, finalizedIndex } of rangeData){
|
|
135
|
+
// Check that the highest index is not further than window length from the highest finalized index.
|
|
136
|
+
if (range.highestIndex > (finalizedIndex ?? 0) + UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN) {
|
|
137
|
+
throw new Error(`Highest used index ${range.highestIndex} is further than window length from the highest finalized index ${finalizedIndex ?? 0}.
|
|
138
|
+
Tagging window length ${UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN} is configured too low. Contact the Aztec team
|
|
139
|
+
to increase it!`);
|
|
160
140
|
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
141
|
+
// Throw if the lowest index is lower than or equal to the last finalized index
|
|
142
|
+
if (finalizedIndex !== undefined && range.lowestIndex <= finalizedIndex) {
|
|
143
|
+
throw new Error(`Cannot store pending index range [${range.lowestIndex}, ${range.highestIndex}] for secret ${secretStr}: ` + `lowestIndex is lower than or equal to the last finalized index ${finalizedIndex}`);
|
|
144
|
+
}
|
|
145
|
+
// Check if an entry with the same txHash already exists
|
|
146
|
+
const existingEntry = pendingData.find((entry)=>entry.txHash === txHashStr);
|
|
147
|
+
if (existingEntry) {
|
|
148
|
+
// Assert that the ranges are equal — different ranges for the same (secret, txHash) indicates a bug
|
|
149
|
+
if (existingEntry.lowestIndex !== range.lowestIndex || existingEntry.highestIndex !== range.highestIndex) {
|
|
150
|
+
throw new Error(`Conflicting range for secret ${secretStr} and txHash ${txHashStr}: ` + `existing [${existingEntry.lowestIndex}, ${existingEntry.highestIndex}] vs ` + `new [${range.lowestIndex}, ${range.highestIndex}]`);
|
|
169
151
|
}
|
|
170
|
-
|
|
152
|
+
// Exact duplicate — skip
|
|
153
|
+
} else {
|
|
154
|
+
this.#writePendingIndexes(jobId, secretStr, [
|
|
155
|
+
...pendingData,
|
|
156
|
+
{
|
|
157
|
+
lowestIndex: range.lowestIndex,
|
|
158
|
+
highestIndex: range.highestIndex,
|
|
159
|
+
txHash: txHashStr
|
|
160
|
+
}
|
|
161
|
+
]);
|
|
162
|
+
}
|
|
171
163
|
}
|
|
172
|
-
}
|
|
164
|
+
});
|
|
173
165
|
}
|
|
174
166
|
/**
|
|
175
|
-
* Returns the transaction hashes of all pending transactions that contain indexes within a specified range
|
|
176
|
-
* for a given directional app tagging secret.
|
|
167
|
+
* Returns the transaction hashes of all pending transactions that contain highest indexes within a specified range
|
|
168
|
+
* for a given directional app tagging secret. We check based on the highest indexes only as that is the relevant
|
|
169
|
+
* information for the caller of this function.
|
|
177
170
|
* @param secret - The directional app tagging secret to query pending indexes for.
|
|
178
171
|
* @param startIndex - The lower bound of the index range (inclusive).
|
|
179
172
|
* @param endIndex - The upper bound of the index range (exclusive).
|
|
180
173
|
* @returns An array of unique transaction hashes for pending transactions that contain indexes in the range
|
|
181
174
|
* [startIndex, endIndex). Returns an empty array if no pending indexes exist in the range.
|
|
182
|
-
*/
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
175
|
+
*/ getTxHashesOfPendingIndexes(secret, startIndex, endIndex, jobId) {
|
|
176
|
+
return this.#store.transactionAsync(async ()=>{
|
|
177
|
+
const existing = await this.#readPendingIndexes(jobId, secret.toString());
|
|
178
|
+
const txHashes = existing.filter((entry)=>entry.highestIndex >= startIndex && entry.highestIndex < endIndex).map((entry)=>entry.txHash);
|
|
179
|
+
return Array.from(new Set(txHashes)).map(TxHash.fromString);
|
|
180
|
+
});
|
|
186
181
|
}
|
|
187
182
|
/**
|
|
188
183
|
* Returns the last (highest) finalized index for a given secret.
|
|
189
184
|
* @param secret - The secret to get the last finalized index for.
|
|
190
185
|
* @returns The last (highest) finalized index for the given secret.
|
|
191
186
|
*/ getLastFinalizedIndex(secret, jobId) {
|
|
192
|
-
return this.#readLastFinalizedIndex(jobId, secret.toString());
|
|
187
|
+
return this.#store.transactionAsync(()=>this.#readLastFinalizedIndex(jobId, secret.toString()));
|
|
193
188
|
}
|
|
194
189
|
/**
|
|
195
190
|
* Returns the last used index for a given directional app tagging secret, considering both finalized and pending
|
|
196
191
|
* indexes.
|
|
197
192
|
* @param secret - The directional app tagging secret to query the last used index for.
|
|
198
193
|
* @returns The last used index.
|
|
199
|
-
*/
|
|
194
|
+
*/ getLastUsedIndex(secret, jobId) {
|
|
200
195
|
const secretStr = secret.toString();
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
196
|
+
return this.#store.transactionAsync(async ()=>{
|
|
197
|
+
const pendingPromise = this.#readPendingIndexes(jobId, secretStr);
|
|
198
|
+
const finalizedPromise = this.#readLastFinalizedIndex(jobId, secretStr);
|
|
199
|
+
const [pendingEntries, lastFinalized] = await Promise.all([
|
|
200
|
+
pendingPromise,
|
|
201
|
+
finalizedPromise
|
|
202
|
+
]);
|
|
203
|
+
if (pendingEntries.length === 0) {
|
|
204
|
+
return lastFinalized;
|
|
205
|
+
}
|
|
206
|
+
// As the last used index we return the highest one from the pending index ranges. Note that this value will be
|
|
207
|
+
// always higher than the last finalized index because we prune lower pending indexes when a tx is finalized.
|
|
208
|
+
return Math.max(...pendingEntries.map((entry)=>entry.highestIndex));
|
|
209
|
+
});
|
|
209
210
|
}
|
|
210
211
|
/**
|
|
211
212
|
* Drops all pending indexes corresponding to the given transaction hashes.
|
|
212
|
-
*/
|
|
213
|
+
*/ dropPendingIndexes(txHashes, jobId) {
|
|
213
214
|
if (txHashes.length === 0) {
|
|
214
|
-
return;
|
|
215
|
+
return Promise.resolve();
|
|
215
216
|
}
|
|
216
217
|
const txHashStrings = new Set(txHashes.map((txHash)=>txHash.toString()));
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
const
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
this.#
|
|
218
|
+
return this.#store.transactionAsync(async ()=>{
|
|
219
|
+
// Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
|
|
220
|
+
const secretReadPromises = new Map();
|
|
221
|
+
for await (const secret of this.#pendingIndexes.keysAsync()){
|
|
222
|
+
secretReadPromises.set(secret, this.#readPendingIndexes(jobId, secret));
|
|
223
|
+
}
|
|
224
|
+
// Add staged-only secrets (sync, no DB)
|
|
225
|
+
for (const secret of this.#getPendingIndexesForJob(jobId).keys()){
|
|
226
|
+
if (!secretReadPromises.has(secret)) {
|
|
227
|
+
secretReadPromises.set(secret, Promise.resolve(this.#getPendingIndexesForJob(jobId).get(secret) ?? []));
|
|
227
228
|
}
|
|
228
|
-
// else: No items were filtered out (txHashes not found for this secret) --> no-op
|
|
229
229
|
}
|
|
230
|
-
|
|
230
|
+
// Await all reads together
|
|
231
|
+
const secrets = [
|
|
232
|
+
...secretReadPromises.keys()
|
|
233
|
+
];
|
|
234
|
+
const pendingDataResults = await Promise.all(secretReadPromises.values());
|
|
235
|
+
// Process in memory
|
|
236
|
+
for(let i = 0; i < secrets.length; i++){
|
|
237
|
+
const secret = secrets[i];
|
|
238
|
+
const pendingData = pendingDataResults[i];
|
|
239
|
+
if (pendingData && pendingData.length > 0) {
|
|
240
|
+
const filtered = pendingData.filter((item)=>!txHashStrings.has(item.txHash));
|
|
241
|
+
if (filtered.length === 0) {
|
|
242
|
+
this.#writePendingIndexes(jobId, secret, []);
|
|
243
|
+
} else if (filtered.length !== pendingData.length) {
|
|
244
|
+
// Some items were filtered out, so update the pending data
|
|
245
|
+
this.#writePendingIndexes(jobId, secret, filtered);
|
|
246
|
+
}
|
|
247
|
+
// else: No items were filtered out (txHashes not found for this secret) --> no-op
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
/** Prefetches all pending and finalized index data for every secret (from both DB and staged writes). */ #getSecretsWithPendingData(jobId) {
|
|
253
|
+
return this.#store.transactionAsync(async ()=>{
|
|
254
|
+
// Prefetch all data, start reads during iteration to keep IndexedDB transaction alive
|
|
255
|
+
const secretDataPromises = new Map();
|
|
256
|
+
for await (const secret of this.#pendingIndexes.keysAsync()){
|
|
257
|
+
secretDataPromises.set(secret, {
|
|
258
|
+
pending: this.#readPendingIndexes(jobId, secret),
|
|
259
|
+
finalized: this.#readLastFinalizedIndex(jobId, secret)
|
|
260
|
+
});
|
|
261
|
+
}
|
|
262
|
+
// Add staged-only secrets (sync, no DB)
|
|
263
|
+
for (const secret of this.#getPendingIndexesForJob(jobId).keys()){
|
|
264
|
+
if (!secretDataPromises.has(secret)) {
|
|
265
|
+
secretDataPromises.set(secret, {
|
|
266
|
+
pending: Promise.resolve(this.#getPendingIndexesForJob(jobId).get(secret) ?? []),
|
|
267
|
+
finalized: Promise.resolve(this.#getLastFinalizedIndexesForJob(jobId).get(secret))
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
// Await all reads together
|
|
272
|
+
const secrets = [
|
|
273
|
+
...secretDataPromises.keys()
|
|
274
|
+
];
|
|
275
|
+
const dataResults = await Promise.all(secrets.map(async (secret)=>({
|
|
276
|
+
secret,
|
|
277
|
+
pendingData: await secretDataPromises.get(secret).pending,
|
|
278
|
+
lastFinalized: await secretDataPromises.get(secret).finalized
|
|
279
|
+
})));
|
|
280
|
+
return dataResults.filter((r)=>r.pendingData.length > 0);
|
|
281
|
+
});
|
|
231
282
|
}
|
|
232
283
|
/**
|
|
233
284
|
* Updates pending indexes corresponding to the given transaction hashes to be finalized and prunes any lower pending
|
|
@@ -236,43 +287,88 @@ import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/constants.
|
|
|
236
287
|
if (txHashes.length === 0) {
|
|
237
288
|
return;
|
|
238
289
|
}
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
if (matchingIndexes.length === 0) {
|
|
290
|
+
const txHashStrings = new Set(txHashes.map((tx)=>tx.toString()));
|
|
291
|
+
const secretsWithData = await this.#getSecretsWithPendingData(jobId);
|
|
292
|
+
for (const { secret, pendingData, lastFinalized } of secretsWithData){
|
|
293
|
+
let currentPending = pendingData;
|
|
294
|
+
let currentFinalized = lastFinalized;
|
|
295
|
+
// Process all txHashes for this secret
|
|
296
|
+
for (const txHashStr of txHashStrings){
|
|
297
|
+
const matchingEntries = currentPending.filter((item)=>item.txHash === txHashStr);
|
|
298
|
+
if (matchingEntries.length === 0) {
|
|
249
299
|
continue;
|
|
250
300
|
}
|
|
251
|
-
if (
|
|
301
|
+
if (matchingEntries.length > 1) {
|
|
252
302
|
// We should always just store the highest pending index for a given tx hash and secret because the lower
|
|
253
303
|
// values are irrelevant.
|
|
254
|
-
throw new Error(`Multiple pending
|
|
304
|
+
throw new Error(`Multiple pending entries found for tx hash ${txHashStr} and secret ${secret}`);
|
|
255
305
|
}
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
if (newFinalized < (lastFinalized ?? 0)) {
|
|
306
|
+
const newFinalized = matchingEntries[0].highestIndex;
|
|
307
|
+
if (newFinalized < (currentFinalized ?? 0)) {
|
|
259
308
|
// This should never happen because when last finalized index was finalized we should have pruned the lower
|
|
260
309
|
// pending indexes.
|
|
261
|
-
throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${
|
|
310
|
+
throw new Error(`New finalized index ${newFinalized} is smaller than the current last finalized index ${currentFinalized}`);
|
|
262
311
|
}
|
|
263
|
-
|
|
264
|
-
lastFinalized = newFinalized;
|
|
312
|
+
currentFinalized = newFinalized;
|
|
265
313
|
// When we add pending indexes, we ensure they are higher than the last finalized index. However, because we
|
|
266
314
|
// cannot control the order in which transactions are finalized, there may be pending indexes that are now
|
|
267
315
|
// obsolete because they are lower than the most recently finalized index. For this reason, we prune these
|
|
268
316
|
// outdated pending indexes.
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
317
|
+
currentPending = currentPending.filter((item)=>item.highestIndex > currentFinalized);
|
|
318
|
+
}
|
|
319
|
+
// Write final state if changed
|
|
320
|
+
if (currentFinalized !== lastFinalized) {
|
|
321
|
+
this.#writeLastFinalizedIndex(jobId, secret, currentFinalized);
|
|
322
|
+
}
|
|
323
|
+
if (currentPending !== pendingData) {
|
|
324
|
+
this.#writePendingIndexes(jobId, secret, currentPending);
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
/**
|
|
329
|
+
* Handles finalization of pending indexes for a transaction whose execution was partially reverted.
|
|
330
|
+
* Recomputes the siloed tags for each pending index of the given tx and checks which ones appear in the
|
|
331
|
+
* TxEffect's private logs (i.e., which ones made it onchain). Those that survived are finalized; those that
|
|
332
|
+
* didn't are dropped.
|
|
333
|
+
* @param txEffect - The tx effect of the partially reverted transaction.
|
|
334
|
+
* @param jobId - job context for staged writes to this store. See `JobCoordinator` for more details.
|
|
335
|
+
*/ async finalizePendingIndexesOfAPartiallyRevertedTx(txEffect, jobId) {
|
|
336
|
+
const txHashStr = txEffect.txHash.toString();
|
|
337
|
+
// Build a set of all siloed tag values that made it onchain (first field of each private log).
|
|
338
|
+
const onChainTags = new Set(txEffect.privateLogs.map((log)=>log.fields[0].toString()));
|
|
339
|
+
const secretsWithData = await this.#getSecretsWithPendingData(jobId);
|
|
340
|
+
for (const { secret, pendingData, lastFinalized } of secretsWithData){
|
|
341
|
+
const matchingEntries = pendingData.filter((item)=>item.txHash === txHashStr);
|
|
342
|
+
if (matchingEntries.length === 0) {
|
|
343
|
+
continue;
|
|
344
|
+
}
|
|
345
|
+
if (matchingEntries.length > 1) {
|
|
346
|
+
// We should always just store the highest pending index for a given tx hash and secret because the lower
|
|
347
|
+
// values are irrelevant.
|
|
348
|
+
throw new Error(`Multiple pending entries found for tx hash ${txHashStr} and secret ${secret}`);
|
|
349
|
+
}
|
|
350
|
+
const pendingEntry = matchingEntries[0];
|
|
351
|
+
// Expand each matching entry's range and recompute siloed tags for each index.
|
|
352
|
+
const extendedSecret = ExtendedDirectionalAppTaggingSecret.fromString(secret);
|
|
353
|
+
let highestSurvivingIndex;
|
|
354
|
+
for(let index = pendingEntry.lowestIndex; index <= pendingEntry.highestIndex; index++){
|
|
355
|
+
const siloedTag = await SiloedTag.compute({
|
|
356
|
+
extendedSecret,
|
|
357
|
+
index
|
|
358
|
+
});
|
|
359
|
+
if (onChainTags.has(siloedTag.value.toString())) {
|
|
360
|
+
highestSurvivingIndex = highestSurvivingIndex !== undefined ? Math.max(highestSurvivingIndex, index) : index;
|
|
274
361
|
}
|
|
275
362
|
}
|
|
363
|
+
// Remove all entries for this txHash from pending (both surviving and non-surviving).
|
|
364
|
+
let currentPending = pendingData.filter((item)=>item.txHash !== txHashStr);
|
|
365
|
+
if (highestSurvivingIndex !== undefined) {
|
|
366
|
+
const newFinalized = Math.max(lastFinalized ?? 0, highestSurvivingIndex);
|
|
367
|
+
this.#writeLastFinalizedIndex(jobId, secret, newFinalized);
|
|
368
|
+
// Prune pending indexes that are now <= the finalized index.
|
|
369
|
+
currentPending = currentPending.filter((item)=>item.highestIndex > newFinalized);
|
|
370
|
+
}
|
|
371
|
+
this.#writePendingIndexes(jobId, secret, currentPending);
|
|
276
372
|
}
|
|
277
373
|
}
|
|
278
374
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
2
|
-
import type {
|
|
2
|
+
import type { BlockHash } from '@aztec/stdlib/block';
|
|
3
3
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
4
4
|
import type { SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
|
|
5
5
|
/**
|
|
@@ -10,7 +10,7 @@ import type { SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
|
|
|
10
10
|
* because of reorgs).
|
|
11
11
|
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
12
12
|
*/
|
|
13
|
-
export declare function getAllPrivateLogsByTags(aztecNode: AztecNode, tags: SiloedTag[], anchorBlockHash:
|
|
13
|
+
export declare function getAllPrivateLogsByTags(aztecNode: AztecNode, tags: SiloedTag[], anchorBlockHash: BlockHash): Promise<TxScopedL2Log[][]>;
|
|
14
14
|
/**
|
|
15
15
|
* Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
|
|
16
16
|
* @param aztecNode - The Aztec node to query.
|
|
@@ -20,5 +20,5 @@ export declare function getAllPrivateLogsByTags(aztecNode: AztecNode, tags: Silo
|
|
|
20
20
|
* because of reorgs).
|
|
21
21
|
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
22
22
|
*/
|
|
23
|
-
export declare function getAllPublicLogsByTagsFromContract(aztecNode: AztecNode, contractAddress: AztecAddress, tags: Tag[], anchorBlockHash:
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
export declare function getAllPublicLogsByTagsFromContract(aztecNode: AztecNode, contractAddress: AztecAddress, tags: Tag[], anchorBlockHash: BlockHash): Promise<TxScopedL2Log[][]>;
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2FsbF9sb2dzX2J5X3RhZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2dldF9hbGxfbG9nc19ieV90YWdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRXJELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFpRHhFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsdUJBQXVCLENBQ3JDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLElBQUksRUFBRSxTQUFTLEVBQUUsRUFDakIsZUFBZSxFQUFFLFNBQVMsR0FDekIsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FJNUI7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FDaEQsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLFlBQVksRUFDN0IsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUNYLGVBQWUsRUFBRSxTQUFTLEdBQ3pCLE9BQU8sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBTTVCIn0=
|
|
@@ -1 +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,
|
|
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;AAiDxE;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EAAE,EACjB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAI5B;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,CAM5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
|
|
1
|
+
import { MAX_LOGS_PER_TAG, MAX_RPC_LEN } from '@aztec/stdlib/interfaces/api-limit';
|
|
2
2
|
/**
|
|
3
3
|
* Generic pagination helper that fetches all pages of results.
|
|
4
4
|
* @param numTags - The number of tags being queried (determines result array size).
|
|
@@ -23,6 +23,20 @@ import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
|
|
|
23
23
|
}
|
|
24
24
|
return allResultsPerTag;
|
|
25
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Splits tags into chunks of MAX_RPC_LEN, fetches logs for each chunk using getAllPages, then stitches the results
|
|
28
|
+
* back into a single array preserving the original tag order.
|
|
29
|
+
*/ async function getAllPagesInBatches(tags, fetchAllPagesForBatch) {
|
|
30
|
+
if (tags.length <= MAX_RPC_LEN) {
|
|
31
|
+
return fetchAllPagesForBatch(tags);
|
|
32
|
+
}
|
|
33
|
+
const batches = [];
|
|
34
|
+
for(let i = 0; i < tags.length; i += MAX_RPC_LEN){
|
|
35
|
+
batches.push(tags.slice(i, i + MAX_RPC_LEN));
|
|
36
|
+
}
|
|
37
|
+
const batchResults = await Promise.all(batches.map(fetchAllPagesForBatch));
|
|
38
|
+
return batchResults.flat();
|
|
39
|
+
}
|
|
26
40
|
/**
|
|
27
41
|
* Fetches all private logs for the given tags, automatically paginating through all pages.
|
|
28
42
|
* @param aztecNode - The Aztec node to query.
|
|
@@ -31,7 +45,7 @@ import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
|
|
|
31
45
|
* because of reorgs).
|
|
32
46
|
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
33
47
|
*/ export function getAllPrivateLogsByTags(aztecNode, tags, anchorBlockHash) {
|
|
34
|
-
return getAllPages(
|
|
48
|
+
return getAllPagesInBatches(tags, (batch)=>getAllPages(batch.length, (page)=>aztecNode.getPrivateLogsByTags(batch, page, anchorBlockHash)));
|
|
35
49
|
}
|
|
36
50
|
/**
|
|
37
51
|
* Fetches all public logs for the given tags from a contract, automatically paginating through all pages.
|
|
@@ -42,5 +56,5 @@ import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
|
|
|
42
56
|
* because of reorgs).
|
|
43
57
|
* @returns An array of log arrays, one per tag, containing all logs across all pages.
|
|
44
58
|
*/ export function getAllPublicLogsByTagsFromContract(aztecNode, contractAddress, tags, anchorBlockHash) {
|
|
45
|
-
return getAllPages(
|
|
59
|
+
return getAllPagesInBatches(tags, (batch)=>getAllPages(batch.length, (page)=>aztecNode.getPublicLogsByTagsFromContract(contractAddress, batch, page, anchorBlockHash)));
|
|
46
60
|
}
|
package/dest/tagging/index.d.ts
CHANGED
|
@@ -12,6 +12,6 @@ export { loadPrivateLogsForSenderRecipientPair } from './recipient_sync/load_pri
|
|
|
12
12
|
export { syncSenderTaggingIndexes } from './sender_sync/sync_sender_tagging_indexes.js';
|
|
13
13
|
export { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from './constants.js';
|
|
14
14
|
export { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract } from './get_all_logs_by_tags.js';
|
|
15
|
-
export {
|
|
16
|
-
export { type PreTag } from '@aztec/stdlib/logs';
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
export { ExtendedDirectionalAppTaggingSecret, Tag, SiloedTag } from '@aztec/stdlib/logs';
|
|
16
|
+
export { type PreTag, type TaggingIndexRange } from '@aztec/stdlib/logs';
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90YWdnaW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7R0FTRztBQUVILE9BQU8sRUFBRSxxQ0FBcUMsRUFBRSxNQUFNLGlFQUFpRSxDQUFDO0FBQ3hILE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3hGLE9BQU8sRUFBRSxzQ0FBc0MsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3hFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxrQ0FBa0MsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR3hHLE9BQU8sRUFBRSxtQ0FBbUMsRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekYsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLEtBQUssaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tagging/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,qCAAqC,EAAE,MAAM,iEAAiE,CAAC;AACxH,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,sCAAsC,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAGxG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tagging/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,qCAAqC,EAAE,MAAM,iEAAiE,CAAC;AACxH,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,sCAAsC,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAGxG,OAAO,EAAE,mCAAmC,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC"}
|
package/dest/tagging/index.js
CHANGED
|
@@ -12,4 +12,4 @@ export { syncSenderTaggingIndexes } from './sender_sync/sync_sender_tagging_inde
|
|
|
12
12
|
export { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from './constants.js';
|
|
13
13
|
export { getAllPrivateLogsByTags, getAllPublicLogsByTagsFromContract } from './get_all_logs_by_tags.js';
|
|
14
14
|
// Re-export tagging-related types from stdlib
|
|
15
|
-
export {
|
|
15
|
+
export { ExtendedDirectionalAppTaggingSecret, Tag, SiloedTag } from '@aztec/stdlib/logs';
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import type { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
-
import type {
|
|
3
|
-
import type { L2BlockHash } from '@aztec/stdlib/block';
|
|
2
|
+
import type { BlockHash } from '@aztec/stdlib/block';
|
|
4
3
|
import type { AztecNode } from '@aztec/stdlib/interfaces/client';
|
|
5
|
-
import type {
|
|
4
|
+
import type { ExtendedDirectionalAppTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/logs';
|
|
6
5
|
import type { RecipientTaggingStore } from '../../storage/tagging_store/recipient_tagging_store.js';
|
|
7
6
|
/**
|
|
8
|
-
* Loads private logs for
|
|
7
|
+
* Loads private logs for the app-sender-recipient triplet defined by `secret` and updates the highest aged and
|
|
9
8
|
* finalized indexes in the db. At most load logs from blocks up to and including `anchorBlockNumber`.
|
|
10
9
|
*
|
|
11
10
|
* @dev This function can be safely executed "in parallel" for other sender-recipient pairs because the data in
|
|
12
11
|
* in the tagging data provider is indexed by the secret and hence completely disjoint.
|
|
13
12
|
*/
|
|
14
|
-
export declare function loadPrivateLogsForSenderRecipientPair(secret:
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
export declare function loadPrivateLogsForSenderRecipientPair(secret: ExtendedDirectionalAppTaggingSecret, aztecNode: AztecNode, taggingStore: RecipientTaggingStore, anchorBlockNumber: BlockNumber, anchorBlockHash: BlockHash, jobId: string): Promise<TxScopedL2Log[]>;
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZF9wcml2YXRlX2xvZ3NfZm9yX3NlbmRlcl9yZWNpcGllbnRfcGFpci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3RhZ2dpbmcvcmVjaXBpZW50X3N5bmMvbG9hZF9wcml2YXRlX2xvZ3NfZm9yX3NlbmRlcl9yZWNpcGllbnRfcGFpci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxtQ0FBbUMsRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU3RixPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdEQUF3RCxDQUFDO0FBS3BHOzs7Ozs7R0FNRztBQUNILHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLG1DQUFtQyxFQUMzQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixZQUFZLEVBQUUscUJBQXFCLEVBQ25DLGlCQUFpQixFQUFFLFdBQVcsRUFDOUIsZUFBZSxFQUFFLFNBQVMsRUFDMUIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FtSDFCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load_private_logs_for_sender_recipient_pair.d.ts","sourceRoot":"","sources":["../../../src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"load_private_logs_for_sender_recipient_pair.d.ts","sourceRoot":"","sources":["../../../src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,mCAAmC,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE7F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAKpG;;;;;;GAMG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,mCAAmC,EAC3C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,qBAAqB,EACnC,iBAAiB,EAAE,WAAW,EAC9B,eAAe,EAAE,SAAS,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,EAAE,CAAC,CAmH1B"}
|