diff --git a/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts b/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts index 8eb077f4adaf..e49a2111aac8 100644 --- a/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts +++ b/yarn-project/pxe/src/contract_function_simulator/contract_function_simulator.ts @@ -77,9 +77,9 @@ import type { CapsuleDataProvider } from '../storage/capsule_data_provider/capsu import type { ContractDataProvider } from '../storage/contract_data_provider/contract_data_provider.js'; import type { NoteDataProvider } from '../storage/note_data_provider/note_data_provider.js'; import type { PrivateEventDataProvider } from '../storage/private_event_data_provider/private_event_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../storage/tagging_data_provider/sender_address_book.js'; import type { SenderTaggingDataProvider } from '../storage/tagging_data_provider/sender_tagging_data_provider.js'; -import type { RecipientTaggingDataProvider } from '../tagging/recipient_sync/recipient_tagging_data_provider.js'; import { ExecutionNoteCache } from './execution_note_cache.js'; import { ExecutionTaggingIndexCache } from './execution_tagging_index_cache.js'; import { HashedValuesCache } from './hashed_values_cache.js'; diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts index 116d972d4e90..a0323dfe1e10 100644 --- a/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts +++ b/yarn-project/pxe/src/contract_function_simulator/oracle/oracle_version_is_checked.test.ts @@ -18,9 +18,9 @@ import type { CapsuleDataProvider } from '../../storage/capsule_data_provider/ca import type { ContractDataProvider } from '../../storage/contract_data_provider/contract_data_provider.js'; import type { NoteDataProvider } from '../../storage/note_data_provider/note_data_provider.js'; import type { PrivateEventDataProvider } from '../../storage/private_event_data_provider/private_event_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../../storage/tagging_data_provider/sender_address_book.js'; import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js'; -import type { RecipientTaggingDataProvider } from '../../tagging/recipient_sync/recipient_tagging_data_provider.js'; import { ContractFunctionSimulator } from '../contract_function_simulator.js'; import { UtilityExecutionOracle } from './utility_execution_oracle.js'; diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts index e8fc3370d83a..983dc3ae05a9 100644 --- a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts +++ b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts @@ -70,9 +70,9 @@ import type { CapsuleDataProvider } from '../../storage/capsule_data_provider/ca import type { ContractDataProvider } from '../../storage/contract_data_provider/contract_data_provider.js'; import type { NoteDataProvider } from '../../storage/note_data_provider/note_data_provider.js'; import type { PrivateEventDataProvider } from '../../storage/private_event_data_provider/private_event_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../../storage/tagging_data_provider/sender_address_book.js'; import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js'; -import type { RecipientTaggingDataProvider } from '../../tagging/recipient_sync/recipient_tagging_data_provider.js'; import { ContractFunctionSimulator } from '../contract_function_simulator.js'; jest.setTimeout(60_000); diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts index 876f516bceb2..19c26e49ccad 100644 --- a/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts +++ b/yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts @@ -36,10 +36,10 @@ import type { CapsuleDataProvider } from '../../storage/capsule_data_provider/ca import type { ContractDataProvider } from '../../storage/contract_data_provider/contract_data_provider.js'; import type { NoteDataProvider } from '../../storage/note_data_provider/note_data_provider.js'; import type { PrivateEventDataProvider } from '../../storage/private_event_data_provider/private_event_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../../storage/tagging_data_provider/sender_address_book.js'; import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js'; -import type { RecipientTaggingDataProvider } from '../../tagging/recipient_sync/recipient_tagging_data_provider.js'; -import { syncSenderTaggingIndexes } from '../../tagging/sync/sync_sender_tagging_indexes.js'; +import { syncSenderTaggingIndexes } from '../../tagging/index.js'; import type { ExecutionNoteCache } from '../execution_note_cache.js'; import { ExecutionTaggingIndexCache } from '../execution_tagging_index_cache.js'; import type { HashedValuesCache } from '../hashed_values_cache.js'; diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts index 623e24918e10..5194c6606330 100644 --- a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts +++ b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution.test.ts @@ -22,9 +22,9 @@ import type { CapsuleDataProvider } from '../../storage/capsule_data_provider/ca import type { ContractDataProvider } from '../../storage/contract_data_provider/contract_data_provider.js'; import type { NoteDataProvider } from '../../storage/note_data_provider/note_data_provider.js'; import type { PrivateEventDataProvider } from '../../storage/private_event_data_provider/private_event_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../../storage/tagging_data_provider/sender_address_book.js'; import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js'; -import type { RecipientTaggingDataProvider } from '../../tagging/recipient_sync/recipient_tagging_data_provider.js'; import { ContractFunctionSimulator } from '../contract_function_simulator.js'; import { UtilityExecutionOracle } from './utility_execution_oracle.js'; diff --git a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts index ee4785f45333..c5ae451de5d6 100644 --- a/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts +++ b/yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts @@ -27,8 +27,8 @@ import type { CapsuleDataProvider } from '../../storage/capsule_data_provider/ca import type { ContractDataProvider } from '../../storage/contract_data_provider/contract_data_provider.js'; import type { NoteDataProvider } from '../../storage/note_data_provider/note_data_provider.js'; import type { PrivateEventDataProvider } from '../../storage/private_event_data_provider/private_event_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../../storage/tagging_data_provider/sender_address_book.js'; -import type { RecipientTaggingDataProvider } from '../../tagging/recipient_sync/recipient_tagging_data_provider.js'; import { TreeMembershipService } from '../../tree_membership/tree_membership_service.js'; import { EventValidationRequest } from '../noir-structs/event_validation_request.js'; import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js'; diff --git a/yarn-project/pxe/src/logs/log_service.test.ts b/yarn-project/pxe/src/logs/log_service.test.ts index b9a80928ef3f..6f20a18122d6 100644 --- a/yarn-project/pxe/src/logs/log_service.test.ts +++ b/yarn-project/pxe/src/logs/log_service.test.ts @@ -12,8 +12,8 @@ import { LogRetrievalRequest } from '../contract_function_simulator/noir-structs import { AddressDataProvider } from '../storage/address_data_provider/address_data_provider.js'; import { AnchorBlockDataProvider } from '../storage/anchor_block_data_provider/anchor_block_data_provider.js'; import { CapsuleDataProvider } from '../storage/capsule_data_provider/capsule_data_provider.js'; +import { RecipientTaggingDataProvider } from '../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import { SenderAddressBook } from '../storage/tagging_data_provider/sender_address_book.js'; -import { RecipientTaggingDataProvider } from '../tagging/recipient_sync/recipient_tagging_data_provider.js'; import { LogService } from './log_service.js'; describe('LogService', () => { diff --git a/yarn-project/pxe/src/logs/log_service.ts b/yarn-project/pxe/src/logs/log_service.ts index 32683b227e15..2745e2f47e54 100644 --- a/yarn-project/pxe/src/logs/log_service.ts +++ b/yarn-project/pxe/src/logs/log_service.ts @@ -11,9 +11,9 @@ import { LogRetrievalResponse } from '../contract_function_simulator/noir-struct import { AddressDataProvider } from '../storage/address_data_provider/address_data_provider.js'; import { AnchorBlockDataProvider } from '../storage/anchor_block_data_provider/anchor_block_data_provider.js'; import { CapsuleDataProvider } from '../storage/capsule_data_provider/capsule_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../storage/tagging_data_provider/recipient_tagging_data_provider.js'; import type { SenderAddressBook } from '../storage/tagging_data_provider/sender_address_book.js'; -import { loadPrivateLogsForSenderRecipientPair } from '../tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js'; -import type { RecipientTaggingDataProvider } from '../tagging/recipient_sync/recipient_tagging_data_provider.js'; +import { loadPrivateLogsForSenderRecipientPair } from '../tagging/index.js'; export class LogService { private log = createLogger('log_service'); diff --git a/yarn-project/pxe/src/pxe.ts b/yarn-project/pxe/src/pxe.ts index 56aa263986dd..9416e8decc9c 100644 --- a/yarn-project/pxe/src/pxe.ts +++ b/yarn-project/pxe/src/pxe.ts @@ -74,9 +74,9 @@ import { CapsuleDataProvider } from './storage/capsule_data_provider/capsule_dat import { ContractDataProvider } from './storage/contract_data_provider/contract_data_provider.js'; import { NoteDataProvider } from './storage/note_data_provider/note_data_provider.js'; import { PrivateEventDataProvider } from './storage/private_event_data_provider/private_event_data_provider.js'; +import { RecipientTaggingDataProvider } from './storage/tagging_data_provider/recipient_tagging_data_provider.js'; import { SenderAddressBook } from './storage/tagging_data_provider/sender_address_book.js'; import { SenderTaggingDataProvider } from './storage/tagging_data_provider/sender_tagging_data_provider.js'; -import { RecipientTaggingDataProvider } from './tagging/recipient_sync/recipient_tagging_data_provider.js'; export type PackedPrivateEvent = InTx & { packedEvent: Fr[]; diff --git a/yarn-project/pxe/src/storage/tagging_data_provider/index.ts b/yarn-project/pxe/src/storage/tagging_data_provider/index.ts index 69c3c6cfd361..84f381d6ff33 100644 --- a/yarn-project/pxe/src/storage/tagging_data_provider/index.ts +++ b/yarn-project/pxe/src/storage/tagging_data_provider/index.ts @@ -1,3 +1,3 @@ export { SenderTaggingDataProvider } from './sender_tagging_data_provider.js'; export { SenderAddressBook } from './sender_address_book.js'; -export { RecipientTaggingDataProvider } from '../../tagging/recipient_sync/recipient_tagging_data_provider.js'; +export { RecipientTaggingDataProvider } from './recipient_tagging_data_provider.js'; diff --git a/yarn-project/pxe/src/tagging/recipient_sync/recipient_tagging_data_provider.ts b/yarn-project/pxe/src/storage/tagging_data_provider/recipient_tagging_data_provider.ts similarity index 100% rename from yarn-project/pxe/src/tagging/recipient_sync/recipient_tagging_data_provider.ts rename to yarn-project/pxe/src/storage/tagging_data_provider/recipient_tagging_data_provider.ts diff --git a/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.test.ts b/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.test.ts index e7b86f9f9f3f..9d0a548616db 100644 --- a/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.test.ts +++ b/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.test.ts @@ -3,7 +3,7 @@ import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { DirectionalAppTaggingSecret, type PreTag } from '@aztec/stdlib/logs'; import { TxHash } from '@aztec/stdlib/tx'; -import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_sender_tagging_indexes.js'; +import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/index.js'; import { SenderTaggingDataProvider } from './sender_tagging_data_provider.js'; describe('SenderTaggingDataProvider', () => { diff --git a/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.ts b/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.ts index 01d61f170c74..5e1fb28798ca 100644 --- a/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.ts +++ b/yarn-project/pxe/src/storage/tagging_data_provider/sender_tagging_data_provider.ts @@ -3,7 +3,7 @@ import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; import type { DirectionalAppTaggingSecret, PreTag } from '@aztec/stdlib/logs'; import { TxHash } from '@aztec/stdlib/tx'; -import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/sync/sync_sender_tagging_indexes.js'; +import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../../tagging/index.js'; /** * Data provider of tagging data used when syncing the sender tagging indexes. The recipient counterpart of this class diff --git a/yarn-project/pxe/src/tagging/index.ts b/yarn-project/pxe/src/tagging/index.ts index c480c5ee3257..0ddf2808e0d6 100644 --- a/yarn-project/pxe/src/tagging/index.ts +++ b/yarn-project/pxe/src/tagging/index.ts @@ -1,2 +1,28 @@ +/** + * This directory contains the sender and recipient synchronization algorithms that use tagging. + * + * The objective of the sender sync algorithm is to determine which tags have already been used by a sender, thereby + * deciding which tag should be used next. + * + * The objective of the recipient sync algorithm is to load and process the corresponding logs. + * + * @module tagging + */ + +export { loadPrivateLogsForSenderRecipientPair } from './recipient_sync/load_private_logs_for_sender_recipient_pair.js'; +export { syncSenderTaggingIndexes } from './sender_sync/sync_sender_tagging_indexes.js'; + +// This window has to be as large as the largest expected number of logs emitted in a tx for a given directional app +// tagging secret. If we get more tag indexes consumed than this window, an error is thrown in `PXE::proveTx` function. +// This is set to a larger value than MAX_PRIVATE_LOGS_PER_TX (currently 64) because there could be more than +// MAX_PRIVATE_LOGS_PER_TX indexes consumed in case the logs are squashed. This happens when the log contains a note +// and the note is nullified in the same tx. +// +// Having a large window significantly slowed down `e2e_l1_with_wall_time` test as there we perform sync for more than +// 1000 secrets. For this reason we set it to a relatively low value of 20. 20 should be sufficient for all the use +// cases. +export const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 20; + +// Re-export tagging-related types from stdlib export { DirectionalAppTaggingSecret, Tag, SiloedTag } from '@aztec/stdlib/logs'; export { type PreTag } from '@aztec/stdlib/logs'; diff --git a/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.test.ts b/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.test.ts index 6ca7fba0d38d..e6b1a7ac3b0b 100644 --- a/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.test.ts +++ b/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.test.ts @@ -9,9 +9,9 @@ import { makeBlockHeader, randomTxScopedPrivateL2Log } from '@aztec/stdlib/testi import { type MockProxy, mock } from 'jest-mock-extended'; -import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../sync/sync_sender_tagging_indexes.js'; +import { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; +import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../index.js'; import { loadPrivateLogsForSenderRecipientPair } from './load_private_logs_for_sender_recipient_pair.js'; -import { RecipientTaggingDataProvider } from './recipient_tagging_data_provider.js'; // In this test suite we don't care about the anchor block behavior as that is sufficiently tested by // the loadLogsForRange test suite, so we use a high block number to ensure it occurs after all logs. diff --git a/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts b/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts index 2eff435e0975..d25f68b27075 100644 --- a/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +++ b/yarn-project/pxe/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts @@ -3,8 +3,8 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import type { DirectionalAppTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/logs'; -import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../sync/sync_sender_tagging_indexes.js'; -import type { RecipientTaggingDataProvider } from './recipient_tagging_data_provider.js'; +import type { RecipientTaggingDataProvider } from '../../storage/tagging_data_provider/recipient_tagging_data_provider.js'; +import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../index.js'; import { findHighestIndexes } from './utils/find_highest_indexes.js'; import { loadLogsForRange } from './utils/load_logs_for_range.js'; diff --git a/yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.test.ts b/yarn-project/pxe/src/tagging/sender_sync/sync_sender_tagging_indexes.test.ts similarity index 98% rename from yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.test.ts rename to yarn-project/pxe/src/tagging/sender_sync/sync_sender_tagging_indexes.test.ts index 16c5361ca9fa..fd21b140de50 100644 --- a/yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.test.ts +++ b/yarn-project/pxe/src/tagging/sender_sync/sync_sender_tagging_indexes.test.ts @@ -8,8 +8,8 @@ import { TxHash, TxStatus } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; import { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js'; -import { DirectionalAppTaggingSecret, SiloedTag, Tag } from '../index.js'; -import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN, syncSenderTaggingIndexes } from './sync_sender_tagging_indexes.js'; +import { DirectionalAppTaggingSecret, SiloedTag, Tag, UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../index.js'; +import { syncSenderTaggingIndexes } from './sync_sender_tagging_indexes.js'; describe('syncSenderTaggingIndexes', () => { // Contract address and secret to be used on the input of the syncSenderTaggingIndexes function. diff --git a/yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.ts b/yarn-project/pxe/src/tagging/sender_sync/sync_sender_tagging_indexes.ts similarity index 86% rename from yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.ts rename to yarn-project/pxe/src/tagging/sender_sync/sync_sender_tagging_indexes.ts index a0b47dfb89f8..3b9c99164926 100644 --- a/yarn-project/pxe/src/tagging/sync/sync_sender_tagging_indexes.ts +++ b/yarn-project/pxe/src/tagging/sender_sync/sync_sender_tagging_indexes.ts @@ -3,20 +3,10 @@ import type { AztecNode } from '@aztec/stdlib/interfaces/server'; import type { DirectionalAppTaggingSecret } from '@aztec/stdlib/logs'; import type { SenderTaggingDataProvider } from '../../storage/tagging_data_provider/sender_tagging_data_provider.js'; +import { UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN } from '../index.js'; import { getStatusChangeOfPending } from './utils/get_status_change_of_pending.js'; import { loadAndStoreNewTaggingIndexes } from './utils/load_and_store_new_tagging_indexes.js'; -// This window has to be as large as the largest expected number of logs emitted in a tx for a given directional app -// tagging secret. If we get more tag indexes consumed than this window, an error is thrown in `PXE::proveTx` function. -// This is set to a larger value than MAX_PRIVATE_LOGS_PER_TX (currently 64) because there could be more than -// MAX_PRIVATE_LOGS_PER_TX indexes consumed in case the logs are squashed. This happens when the log contains a note -// and the note is nullified in the same tx. -// -// Having a large window significantly slowed down `e2e_l1_with_wall_time` test as there we perform sync for more than -// 1000 secrets. For this reason we set it to a relatively low value of 20. 20 should be sufficient for all the use -// cases. -export const UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN = 20; - /** * Syncs tagging indexes. This function needs to be called whenever a private log is being sent. * diff --git a/yarn-project/pxe/src/tagging/sync/utils/get_status_change_of_pending.test.ts b/yarn-project/pxe/src/tagging/sender_sync/utils/get_status_change_of_pending.test.ts similarity index 100% rename from yarn-project/pxe/src/tagging/sync/utils/get_status_change_of_pending.test.ts rename to yarn-project/pxe/src/tagging/sender_sync/utils/get_status_change_of_pending.test.ts diff --git a/yarn-project/pxe/src/tagging/sync/utils/get_status_change_of_pending.ts b/yarn-project/pxe/src/tagging/sender_sync/utils/get_status_change_of_pending.ts similarity index 100% rename from yarn-project/pxe/src/tagging/sync/utils/get_status_change_of_pending.ts rename to yarn-project/pxe/src/tagging/sender_sync/utils/get_status_change_of_pending.ts diff --git a/yarn-project/pxe/src/tagging/sync/utils/load_and_store_new_tagging_indexes.test.ts b/yarn-project/pxe/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.test.ts similarity index 100% rename from yarn-project/pxe/src/tagging/sync/utils/load_and_store_new_tagging_indexes.test.ts rename to yarn-project/pxe/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.test.ts diff --git a/yarn-project/pxe/src/tagging/sync/utils/load_and_store_new_tagging_indexes.ts b/yarn-project/pxe/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts similarity index 100% rename from yarn-project/pxe/src/tagging/sync/utils/load_and_store_new_tagging_indexes.ts rename to yarn-project/pxe/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts