miden_client/sync/

state_sync.rs

use alloc::boxed::Box;
use alloc::collections::{BTreeMap, BTreeSet};
use alloc::sync::Arc;
use alloc::vec::Vec;
use core::cmp::Ordering;

use async_trait::async_trait;
use futures::{StreamExt, TryStreamExt};
use miden_protocol::Word;
use miden_protocol::account::{Account, AccountHeader, AccountId, StorageSlotType};
use miden_protocol::block::account_tree::AccountIdKey;
use miden_protocol::block::{BlockHeader, BlockNumber, ValidatorConfig};
use miden_protocol::crypto::merkle::MerklePath;
use miden_protocol::crypto::merkle::mmr::{InOrderIndex, MmrDelta, PartialMmr};
use miden_protocol::note::{NoteId, NoteTag, Nullifier};
use miden_protocol::protocol_config::ProtocolConfig;
use tracing::info;

use super::state_sync_update::{TransactionUpdateTracker, build_account_patch};
use super::{
    AccountUpdates,
    NoteObserver,
    PartialBlockchainUpdates,
    PublicAccountUpdate,
    StateSyncUpdate,
};
use crate::ClientError;
use crate::note::{NoteConsumption, NoteUpdateTracker};
use crate::rpc::domain::account::{
    AccountDetails,
    AccountProof,
    AccountStorageMapDetails,
    GetAccountRequest,
    StorageMapFetch,
    VaultFetch,
};
use crate::rpc::domain::note::{CommittedNote, FetchedNote, ResolvedSyncNotesBlock, SyncedNote};
use crate::rpc::domain::sync::{ChainMmrInfo, SyncTarget};
use crate::rpc::domain::transaction::TransactionRecord as RpcTransactionRecord;
use crate::rpc::{AccountStateAt, NodeRpcClient, NoteContentFetch, RpcError};
use crate::store::input_note_states::UnverifiedNoteState;
use crate::store::{InputNoteRecord, OutputNoteRecord, StoreError};
use crate::transaction::TransactionRecord;

/// Maximum number of `get_account` requests kept in flight while syncing the state.
const MAX_CONCURRENT_ACCOUNT_FETCHES: usize = 4;

// STATE UPDATE DATA
// ================================================================================================

/// How a node snapshot of a public account should be reconciled against the local state.
enum PublicAccountSync {
    /// Node is newer — apply its state to the store.
    Apply(Box<PublicAccountUpdate>),
    /// Same nonce but different state — the local transaction lost the race and must be discarded.
    Superseded,
    /// Node is behind the local (potentially optimistic) state — leave the local state untouched.
    Ignore,
}

/// Data fetched from the node needed to sync the client to the chain tip.
///
/// Aggregates the responses of `sync_chain_mmr`, `sync_notes`, `get_notes_by_id`, and
/// `sync_transactions`. This may contain more data than a particular client needs to store — it is
/// filtered and transformed into a [`StateSyncUpdate`] before being applied.
struct FetchedSyncData {
    /// MMR delta covering the full range from `current_block` to `chain_tip`.
    mmr_delta: MmrDelta,
    /// Chain tip block header.
    chain_tip_header: BlockHeader,
    /// Blocks with matching notes that the client is interested in, each note carrying its
    /// attachments and, for a fetched public note, its body.
    note_blocks: Vec<ResolvedSyncNotesBlock>,
    /// Transaction records for the synced range, as returned by `sync_transactions`.
    transactions: Vec<RpcTransactionRecord>,
    /// The protocol configuration active at the chain tip. The node sends it when the sync starts
    /// at genesis, or when the starting block and the chain tip commit to different configurations.
    protocol_config: Option<ProtocolConfig>,
}

/// A note a watched account consumed, carrying what recovery needs to validate and attribute it.
///
/// Complements the note id (under which recovery keys these entries) from the node's `(nullifier,
/// note_id)` reference with the consuming account and block.
struct RecoverableConsumedNote {
    nullifier: Nullifier,
    consumer: AccountId,
    block_num: BlockNumber,
}

/// A note block that must be authenticated after screening.
///
/// `observer_requires_block` preserves the [`NoteObserver::observe`] contract independently of
/// whether any normally-tracked note in the block remains unspent at the end of the sync.
struct RelevantNoteBlock {
    block_header: BlockHeader,
    mmr_path: MerklePath,
    observer_requires_block: bool,
}

/// The two independent reasons a screened note block may be relevant.
#[derive(Default)]
struct NoteBlockRelevance {
    has_client_note: bool,
    observer_requires_block: bool,
}

impl NoteBlockRelevance {
    fn is_relevant(&self) -> bool {
        self.has_client_note || self.observer_requires_block
    }
}

// SYNC REQUEST
// ================================================================================================

/// Bundles the client state needed to perform a sync operation.
///
/// The sync process uses these inputs to:
/// - Request account commitment updates from the node for the provided accounts.
/// - Filter which note inclusions the node returns based on the provided note tags.
/// - Follow the lifecycle of every tracked note (input and output), transitioning them from pending
///   to committed to consumed as the network state advances.
/// - Track uncommitted transactions so they can be marked as committed when the node confirms them,
///   or discarded when they become stale.
///
/// Use [`Client::build_sync_input()`](`crate::Client::build_sync_input()`) to build a default input
/// from the client state, or construct this struct manually for custom sync scenarios.
pub struct StateSyncInput {
    /// Headers of the tracked accounts to follow during the sync.
    pub accounts: Vec<AccountHeader>,
    /// Note tags that the node uses to filter which note inclusions to return.
    pub note_tags: BTreeSet<NoteTag>,
    /// Input notes whose lifecycle should be followed during sync.
    pub input_notes: Vec<InputNoteRecord>,
    /// Output notes whose lifecycle should be followed during sync.
    ///
    /// Inclusion (committed) updates are derived from transaction sync, so the account that created
    /// a note must be present in `accounts` for the note to transition to committed. The consumed
    /// transition does not depend on this: nullifier sync detects it regardless.
    pub output_notes: Vec<OutputNoteRecord>,
    /// Transactions to track for commitment or discard during sync.
    pub uncommitted_transactions: Vec<TransactionRecord>,
}

// SYNC CALLBACKS
// ================================================================================================

/// The action to be taken when a note update is received as part of the sync response.
#[allow(clippy::large_enum_variant)]
pub enum NoteUpdateAction {
    /// The note commit update is relevant and the specified note should be marked as committed in
    /// the store, storing its inclusion proof.
    Commit(CommittedNote),
    /// The public note is relevant and should be inserted into the store.
    Insert(InputNoteRecord),
    /// The note update is not relevant and should be discarded.
    Discard,
}

#[async_trait(?Send)]
pub trait OnNoteReceived {
    /// Callback that gets executed when a new note is received as part of the sync response.
    ///
    /// It receives:
    ///
    /// - The committed note received from the network.
    /// - An optional note record that corresponds to the state of the note in the network (only if
    ///   the note is public).
    ///
    /// It returns an enum indicating the action to be taken for the received note update. Whether
    /// the note updated should be committed, new public note inserted, or ignored.
    async fn on_note_received(
        &self,
        committed_note: CommittedNote,
        public_note: Option<InputNoteRecord>,
    ) -> Result<NoteUpdateAction, ClientError>;
}
// STATE SYNC
// ================================================================================================

/// The state sync component encompasses the client's sync logic. It is then used to request updates
/// from the node and apply them to the relevant elements. The updates are then returned and can be
/// applied to the store to persist the changes.
#[derive(Clone)]
pub struct StateSync {
    /// The RPC client used to communicate with the node.
    rpc_api: Arc<dyn NodeRpcClient>,
    /// Responsible for checking the relevance of notes and executing the [`OnNoteReceived`]
    /// callback when a new note inclusion is received.
    note_screener: Arc<dyn OnNoteReceived>,
    /// Per-note observers (see [`NoteObserver`]), invoked *before* the screener verdict in
    /// `note_state_sync`. Empty by default.
    note_observers: Vec<Arc<dyn NoteObserver>>,
    /// Number of blocks after which pending transactions are considered stale and discarded. If
    /// `None`, there is no limit and transactions will be kept indefinitely.
    tx_discard_delta: Option<u32>,
    /// If true, queries the node for consumption of tracked unspent-note nullifiers each sync and
    /// discards local transactions whose inputs were nullified.
    sync_nullifiers: bool,
    /// The validator set and quorum that the chain tip block header must be signed by. A sync
    /// validates every `sync_chain_mmr` response against it.
    validator_config: ValidatorConfig,
}

impl StateSync {
    /// Creates a new instance of the state sync component.
    ///
    /// The nullifiers sync is enabled by default. To disable it, see
    /// [`Self::disable_nullifier_sync`].
    ///
    /// # Arguments
    ///
    /// * `rpc_api` - The RPC client used to communicate with the node.
    /// * `note_screener` - The note screener used to check the relevance of notes.
    /// * `tx_discard_delta` - Number of blocks after which pending transactions are discarded.
    /// * `validator_config` - The validator set and quorum the chain tip header must be signed by.
    pub fn new(
        rpc_api: Arc<dyn NodeRpcClient>,
        note_screener: Arc<dyn OnNoteReceived>,
        tx_discard_delta: Option<u32>,
        validator_config: ValidatorConfig,
    ) -> Self {
        Self {
            rpc_api,
            note_screener,
            note_observers: Vec::new(),
            tx_discard_delta,
            sync_nullifiers: true,
            validator_config,
        }
    }

    /// Attaches a [`NoteObserver`] to this sync component. Observers run in attachment order
    /// *before* the screener verdict; failures are logged (tagged with [`NoteObserver::name`]) and
    /// never abort sync.
    #[must_use]
    pub fn with_note_observer(mut self, observer: Arc<dyn NoteObserver>) -> Self {
        self.note_observers.push(observer);
        self
    }

    /// Disables the nullifier sync.
    ///
    /// When disabled, the component will not query the node for new nullifiers after each sync
    /// step. This is useful for clients that don't need to track note consumption, such as faucets.
    pub fn disable_nullifier_sync(&mut self) {
        self.sync_nullifiers = false;
    }

    /// Enables the nullifier sync.
    pub fn enable_nullifier_sync(&mut self) {
        self.sync_nullifiers = true;
    }

    /// Runs each attached observer's `apply()` hook against `state_sync_update`. Called by the
    /// orchestrator after [`Self::sync_state`] returns but before the caller persists the sync
    /// update. Per-observer failures are logged (tagged with the observer's [`NoteObserver::name`])
    /// and never abort the rest of the pass — symmetric with the per-note `observe()` dispatcher.
    pub(crate) async fn run_apply_hooks(
        &self,
        state_sync_update: &StateSyncUpdate,
    ) -> Result<(), ClientError> {
        for observer in &self.note_observers {
            crate::errors::log_observer_failure(
                observer.name(),
                "NoteObserver::apply",
                observer.apply(state_sync_update).await,
            );
        }
        Ok(())
    }

    /// Syncs the state of the client with the chain tip of the node, returning the updates that
    /// should be applied to the store.
    ///
    /// Use [`Client::build_sync_input()`](`crate::Client::build_sync_input()`) to build the default
    /// input, or assemble it manually for custom sync. The `current_partial_mmr` is taken by
    /// mutable reference so callers can keep it in memory across syncs; it is only modified once
    /// every check has passed.
    ///
    /// During the sync process, the following steps are performed:
    /// 1. Fetch sync data from the node (MMR delta, note inclusions, transactions).
    /// 2. Update account states (fetch updated public accounts, flag mismatched private ones).
    /// 3. Screen note inclusions via the configured [`OnNoteReceived`] callback.
    /// 4. Process transaction inclusions (commit local txs, record external consumers, discard
    ///    stale/expired txs, commit output notes).
    /// 5. Recover the public notes a tracked account consumed but the client never tracked.
    /// 6. Detect consumed notes via nullifier sync (optional, see
    ///    [`Self::disable_nullifier_sync`]).
    /// 7. Advance the partial MMR to the chain tip and track the screened blocks that still hold an
    ///    unspent note.
    ///
    /// Steps 1-2 are [`Self::fetch_state`], 3-5 [`Self::derive_state_updates`], 6
    /// [`Self::fetch_nullifiers`] and 7 [`Self::build_update`]; each can be driven separately.
    pub async fn sync_state(
        &self,
        current_partial_mmr: &mut PartialMmr,
        input: StateSyncInput,
    ) -> Result<StateSyncUpdate, ClientError> {
        let block_num = block_num_from_forest(current_partial_mmr)?;

        let mut chain_sync_data = self.fetch_state(block_num, input).await?;
        self.derive_state_updates(&mut chain_sync_data).await?;
        self.fetch_nullifiers(&mut chain_sync_data).await?;

        // Work on a clone so any validation failure leaves `current_partial_mmr` untouched.
        let mut working_mmr = current_partial_mmr.clone();
        let update = Self::build_update(chain_sync_data, &mut working_mmr)?;
        *current_partial_mmr = working_mmr;

        Ok(update)
    }

    /// Fetches the node's view of everything that changed since `block_from`: the MMR delta, the
    /// note inclusions, the transactions, and the account states.
    ///
    /// Every node call that does not depend on note screening happens here, so a caller can run
    /// this concurrently with another sync's fetch. Interpreting the response is
    /// [`Self::derive_state_updates`]'s, and the nullifier check [`Self::fetch_nullifiers`]'s. Both
    /// run afterwards so a caller syncing more than one source can write the other source first,
    /// and check nullifiers once across all of them.
    pub async fn fetch_state(
        &self,
        block_from: BlockNumber,
        input: StateSyncInput,
    ) -> Result<ChainSyncData, ClientError> {
        let StateSyncInput {
            accounts,
            note_tags,
            input_notes,
            output_notes,
            uncommitted_transactions,
        } = input;

        let note_tags = Arc::new(note_tags);
        let account_ids: Vec<AccountId> = accounts.iter().map(AccountHeader::id).collect();

        let note_updates = NoteUpdateTracker::new(input_notes, output_notes);
        let transaction_updates = TransactionUpdateTracker::new(uncommitted_transactions);
        let mut account_updates = AccountUpdates::default();

        let Some(sync_data) = self.fetch_sync_data(block_from, &account_ids, &note_tags).await?
        else {
            // No progress — already at the tip.
            return Ok(ChainSyncData {
                block_from,
                advance: None,
                superseded_states: Vec::new(),
                note_updates,
                transaction_updates,
                account_updates,
            });
        };

        let FetchedSyncData {
            mmr_delta,
            chain_tip_header,
            note_blocks,
            transactions,
            protocol_config,
        } = sync_data;

        let new_commitments = derive_account_commitments(&transactions);
        let superseded_states = self
            .account_state_sync(
                &mut account_updates,
                &accounts,
                &new_commitments,
                block_from,
                &chain_tip_header,
            )
            .await?;

        Ok(ChainSyncData {
            block_from,
            advance: Some(ChainAdvance {
                chain_tip_header,
                mmr_delta,
                note_blocks_awaiting_screening: note_blocks,
                transactions,
                relevant_note_blocks: Vec::new(),
                protocol_config,
            }),
            superseded_states,
            note_updates,
            transaction_updates,
            account_updates,
        })
    }

    /// Turns the node's raw response into note and transaction updates.
    ///
    /// Discards the local transactions the node superseded, screens the received notes for
    /// relevance, applies the transaction inclusions, and recovers the public notes the tracked
    /// accounts consumed, fetching those by id.
    pub async fn derive_state_updates(
        &self,
        chain_sync_data: &mut ChainSyncData,
    ) -> Result<(), ClientError> {
        let ChainSyncData {
            advance,
            superseded_states,
            note_updates,
            transaction_updates,
            ..
        } = chain_sync_data;

        let Some(advance) = advance.as_mut() else {
            return Ok(());
        };

        // Discard the local transactions whose result lost a same-nonce race against the network.
        for superseded_state in core::mem::take(superseded_states) {
            transaction_updates.apply_superseded_account_state(superseded_state);
        }

        advance.relevant_note_blocks = self
            .screen_note_blocks(
                core::mem::take(&mut advance.note_blocks_awaiting_screening),
                note_updates,
            )
            .await?;

        self.apply_transactions_and_nullifiers(
            &advance.chain_tip_header,
            &advance.transactions,
            note_updates,
            transaction_updates,
        )?;

        self.recover_consumed_public_notes(note_updates, &advance.transactions).await?;

        Ok(())
    }

    /// Verifies the fetched chain data against `partial_mmr` and turns it into the update to apply
    /// to the store.
    ///
    /// It applies the node's delta, checks the resulting peaks against the chain tip header's chain
    /// commitment, and tracks the screened note blocks that still hold an unspent note.
    pub fn build_update(
        chain_sync_data: ChainSyncData,
        partial_mmr: &mut PartialMmr,
    ) -> Result<StateSyncUpdate, ClientError> {
        let ChainSyncData {
            block_from,
            advance,
            note_updates,
            transaction_updates,
            account_updates,
            ..
        } = chain_sync_data;

        let mut partial_blockchain_updates = PartialBlockchainUpdates::default();

        let Some(ChainAdvance {
            chain_tip_header,
            mmr_delta,
            note_blocks_awaiting_screening,
            relevant_note_blocks,
            protocol_config,
            ..
        }) = advance
        else {
            // No progress — already at the tip.
            return Ok(StateSyncUpdate::from_parts(
                block_from,
                partial_blockchain_updates,
                note_updates,
                transaction_updates,
                account_updates,
                None,
            ));
        };
        // Check the note blocks have been screened before building the update
        if !note_blocks_awaiting_screening.is_empty() {
            return Err(ClientError::UnscreenedNoteBlocks);
        }

        let chain_tip = chain_tip_header.block_num();

        Self::advance_mmr(
            mmr_delta,
            &chain_tip_header,
            partial_mmr,
            &mut partial_blockchain_updates,
        )?;

        let blocks_with_unspent_notes: BTreeSet<BlockNumber> =
            note_updates.unspent_input_note_block_numbers().collect();

        Self::validate_and_track_note_blocks(
            relevant_note_blocks,
            &blocks_with_unspent_notes,
            partial_mmr,
            &mut partial_blockchain_updates,
        )?;

        Ok(StateSyncUpdate::from_parts(
            chain_tip,
            partial_blockchain_updates,
            note_updates,
            transaction_updates,
            account_updates,
            protocol_config,
        ))
    }

    /// Checks the node for nullifiers of every note `chain_sync_data` could have consumed.
    ///
    /// The query covers every note the tracker holds, including any the caller added from another
    /// sync path — so a transport-delivered note consumed within one sync is reported as consumed
    /// by that same sync.
    ///
    /// No-op when the nullifier sync is disabled (see [`Self::disable_nullifier_sync`]) or when the
    /// node reported no progress, since there is no block range to query.
    pub async fn fetch_nullifiers(
        &self,
        chain_sync_data: &mut ChainSyncData,
    ) -> Result<(), ClientError> {
        if !self.sync_nullifiers {
            return Ok(());
        }

        let Some(chain_tip) = chain_sync_data
            .advance
            .as_ref()
            .map(|advance| advance.chain_tip_header.block_num())
        else {
            return Ok(());
        };

        self.nullifiers_state_sync(
            &mut chain_sync_data.note_updates,
            &mut chain_sync_data.transaction_updates,
            chain_tip,
            chain_sync_data.block_from,
        )
        .await
    }

    /// Recovers public notes a watched account consumed, from the `consumed_note_refs` the node
    /// attaches to its transactions. Fetches the body of each not-yet-tracked note by id and hands
    /// it to [`NoteUpdateTracker::insert_consumed_public_note`]. Notes the node doesn't return are
    /// skipped; a reference the node resolves to a private note is rejected as an invalid response.
    async fn recover_consumed_public_notes(
        &self,
        note_updates: &mut NoteUpdateTracker,
        transactions: &[RpcTransactionRecord],
    ) -> Result<(), ClientError> {
        let mut recoverable_consumed_notes: BTreeMap<NoteId, RecoverableConsumedNote> =
            BTreeMap::new();
        for tx in transactions {
            for (nullifier, note_id) in tx.trusted_consumed_note_refs() {
                recoverable_consumed_notes.insert(
                    note_id,
                    RecoverableConsumedNote {
                        nullifier,
                        consumer: tx.transaction_header.account_id(),
                        block_num: tx.block_num,
                    },
                );
            }
        }
        // Skip references whose note the client already tracks (e.g. discovered by tag), to avoid
        // clobbering full-detail records and fetching bodies we already hold.
        recoverable_consumed_notes.retain(|note_id, _| !note_updates.tracks_note(*note_id));

        let note_ids: Vec<NoteId> = recoverable_consumed_notes.keys().copied().collect();
        if note_ids.is_empty() {
            return Ok(());
        }

        for fetched in self.rpc_api.get_notes_by_id(&note_ids).await? {
            match fetched {
                FetchedNote::Public(note, _) => {
                    let Some(reference) = recoverable_consumed_notes.get(&note.id()) else {
                        continue;
                    };
                    // Make sure the fetched body actually hashes to the nullifier the transaction
                    // consumed, so a byzantine node can't attribute an unrelated note here.
                    if note.nullifier() != reference.nullifier {
                        return Err(RpcError::InvalidResponse(format!(
                            "node returned note {} whose nullifier doesn't match the consumed reference",
                            note.id()
                        ))
                        .into());
                    }
                    note_updates.insert_consumed_public_note(
                        note,
                        reference.consumer,
                        reference.block_num,
                    )?;
                },
                FetchedNote::Private(note_id, ..) => {
                    return Err(RpcError::InvalidResponse(format!(
                        "node returned private note {note_id} for a public consumed-note reference"
                    ))
                    .into());
                },
            }
        }

        Ok(())
    }

    /// Fetches the sync data from the node by calling the following endpoints:
    /// 1. `sync_chain_mmr` — discovers the chain tip, gets the MMR delta and chain tip header.
    /// 2. `sync_notes` — loops until the full range to the chain tip is covered (handles paginated
    ///    responses).
    /// 3. `get_notes_by_id` — fetches public note bodies, plus attachment content the sync response
    ///    did not already carry.
    /// 4. `sync_transactions` — gets transaction data for the full range.
    ///
    /// Returns `None` when the client is already at the chain tip (no progress).
    async fn fetch_sync_data(
        &self,
        current_block_num: BlockNumber,
        account_ids: &[AccountId],
        note_tags: &Arc<BTreeSet<NoteTag>>,
    ) -> Result<Option<FetchedSyncData>, ClientError> {
        // Step 1: Fetch the MMR delta and chain tip header.
        let chain_mmr_info = self
            .rpc_api
            .sync_chain_mmr(current_block_num, SyncTarget::CommittedChainTip)
            .await?;
        let chain_tip = chain_mmr_info.block_to;

        // Validate the response covers the range we requested and is signed by the validator set.
        Self::validate_chain_mmr_response(
            &chain_mmr_info,
            current_block_num,
            &self.validator_config,
        )?;

        // No progress — already at the tip.
        if chain_tip == current_block_num {
            info!(block_num = %current_block_num, "Already at chain tip, nothing to sync.");
            return Ok(None);
        }

        info!(
            block_from = %current_block_num,
            block_to = %chain_tip,
            "Syncing state.",
        );

        // Steps 2 and 3: note inclusions and transaction records are independent given the chain
        // tip, so both are driven concurrently and the first failure aborts the pass.
        let (note_blocks, transaction_records) = futures::try_join!(
            self.fetch_note_blocks(current_block_num + 1, chain_tip, note_tags),
            self.fetch_transactions(current_block_num + 1, chain_tip, account_ids),
        )?;

        // Validate every returned note block falls in (current_block_num, chain_tip].
        Self::validate_note_blocks_range(&note_blocks, current_block_num, chain_tip)?;

        let note_count: usize = note_blocks.iter().map(|b| b.notes.len()).sum();
        info!(
            blocks_with_notes = note_blocks.len(),
            notes = note_count,
            "Fetched note sync data.",
        );

        Self::validate_transaction_records_range(
            &transaction_records,
            current_block_num,
            chain_tip,
        )?;

        Ok(Some(FetchedSyncData {
            mmr_delta: chain_mmr_info.mmr_delta,
            chain_tip_header: chain_mmr_info.block_header,
            note_blocks,
            transactions: transaction_records,
            protocol_config: chain_mmr_info.protocol_config,
        }))
    }

    // HELPERS
    // --------------------------------------------------------------------------------------------

    /// Syncs the note inclusions matching `note_tags` over `[block_from, block_to]`, resolving the
    /// body of every public note and the attachment content of every note that carries attachments.
    async fn fetch_note_blocks(
        &self,
        block_from: BlockNumber,
        block_to: BlockNumber,
        note_tags: &BTreeSet<NoteTag>,
    ) -> Result<Vec<ResolvedSyncNotesBlock>, ClientError> {
        if note_tags.is_empty() {
            return Ok(Vec::new());
        }

        self.rpc_api
            .sync_notes_with_content(
                block_from,
                block_to,
                note_tags,
                NoteContentFetch::PublicDetailsAndAttachments,
            )
            .await
            .map_err(ClientError::RpcError)
    }

    /// Syncs the transaction records of `account_ids` over `[block_from, block_to]`.
    async fn fetch_transactions(
        &self,
        block_from: BlockNumber,
        block_to: BlockNumber,
        account_ids: &[AccountId],
    ) -> Result<Vec<RpcTransactionRecord>, ClientError> {
        if account_ids.is_empty() {
            return Ok(Vec::new());
        }

        self.rpc_api
            .sync_transactions(block_from, block_to, account_ids.to_vec())
            .await
            .map_err(ClientError::RpcError)
    }

    /// Validates that a `sync_chain_mmr` response covers the requested range and that the chain tip
    /// block header carries the signatures of `validator_config`.
    fn validate_chain_mmr_response(
        chain_mmr_info: &ChainMmrInfo,
        current_block_num: BlockNumber,
        validator_config: &ValidatorConfig,
    ) -> Result<(), ClientError> {
        if chain_mmr_info.block_header.block_num() != chain_mmr_info.block_to {
            return Err(ClientError::ChainValidationError(format!(
                "sync_chain_mmr block_header.block_num ({}) does not match block_to ({})",
                chain_mmr_info.block_header.block_num(),
                chain_mmr_info.block_to
            )));
        }
        if chain_mmr_info.block_from != current_block_num {
            return Err(ClientError::ChainValidationError(format!(
                "sync_chain_mmr block_from mismatch: expected {current_block_num}, got {}",
                chain_mmr_info.block_from
            )));
        }
        if chain_mmr_info.block_to < current_block_num {
            return Err(ClientError::ChainValidationError(format!(
                "sync_chain_mmr block_to ({}) is behind current block {current_block_num}",
                chain_mmr_info.block_to
            )));
        }

        // Check that the validator set signed the chain tip block header.
        chain_mmr_info
            .block_signatures
            .verify_against(chain_mmr_info.block_header.commitment(), validator_config)
            .map_err(|err| {
                ClientError::ChainValidationError(format!(
                    "chain tip block header {} does not carry valid validator signatures: {err}",
                    chain_mmr_info.block_header.block_num()
                ))
            })?;

        Ok(())
    }

    /// Validates that every block returned by `sync_notes` falls in the requested range
    /// `(current_block_num, chain_tip]`.
    fn validate_note_blocks_range(
        note_blocks: &[ResolvedSyncNotesBlock],
        current_block_num: BlockNumber,
        chain_tip: BlockNumber,
    ) -> Result<(), ClientError> {
        for block in note_blocks {
            let block_num = block.block_header.block_num();
            if block_num <= current_block_num || block_num > chain_tip {
                return Err(ClientError::ChainValidationError(format!(
                    "sync_notes returned block {block_num} outside requested range ({current_block_num}, {chain_tip}]"
                )));
            }
        }
        Ok(())
    }

    /// Validates that every record returned by `sync_transactions` falls in the requested range
    /// `(current_block_num, chain_tip]`.
    fn validate_transaction_records_range(
        records: &[RpcTransactionRecord],
        current_block_num: BlockNumber,
        chain_tip: BlockNumber,
    ) -> Result<(), ClientError> {
        for record in records {
            let block_num = record.block_num;
            if block_num <= current_block_num || block_num > chain_tip {
                return Err(ClientError::ChainValidationError(format!(
                    "sync_transactions returned block {block_num} outside requested range ({current_block_num}, {chain_tip}]"
                )));
            }
        }
        Ok(())
    }

    /// Applies the MMR delta and inserts the chain-tip leaf into the partial blockchain updates.
    /// The delta excludes the chain-tip leaf because of the one-block lag in block header MMR
    /// commitments, so the tip leaf has to be added separately.
    ///
    /// Before adding the chain-tip leaf, the post-delta peaks are checked against the chain tip
    /// header's chain commitment to ensure the delta advanced the MMR to the expected state.
    fn advance_mmr(
        mmr_delta: MmrDelta,
        chain_tip_header: &BlockHeader,
        current_partial_mmr: &mut PartialMmr,
        partial_blockchain_updates: &mut PartialBlockchainUpdates,
    ) -> Result<(), ClientError> {
        let mut new_authentication_nodes =
            current_partial_mmr.apply(mmr_delta).map_err(StoreError::MmrError)?;
        let new_peaks = current_partial_mmr.peaks();

        // Verify that post-delta peaks match the block header's chain commitment. chain_commitment
        // is the hash of MMR peaks for blocks 0..block_num-1, which is exactly the state after
        // applying the delta.
        let peaks_commitment = new_peaks.hash_peaks();
        if peaks_commitment != chain_tip_header.chain_commitment() {
            return Err(ClientError::ChainValidationError(format!(
                "MMR peaks commitment is {} and does not match block header chain commitment {}",
                peaks_commitment.to_hex(),
                chain_tip_header.chain_commitment().to_hex()
            )));
        }

        partial_blockchain_updates.new_peaks = new_peaks;

        // Note: we add the chain tip leaf to our MMR, but we cannot prove that it is effectively
        // the chain tip. In the current context of centralized trusted node, we assume it is valid.
        // Eventually, we will be able to validate that the resulting MMR root is "canonical".
        new_authentication_nodes.append(
            &mut current_partial_mmr
                .add(chain_tip_header.commitment(), false)
                .map_err(StoreError::MmrError)?,
        );

        partial_blockchain_updates.insert(chain_tip_header.clone(), false);
        partial_blockchain_updates.extend_authentication_nodes(new_authentication_nodes);

        Ok(())
    }

    /// Screens each note block for relevance, returning those with client-relevant notes and their
    /// authentication path from the `sync_notes` response.
    ///
    /// These are candidates only — whether a normally-tracked note survives unspent isn't known
    /// until nullifiers are processed, so tracking is deferred to
    /// [`Self::validate_and_track_note_blocks`]. Blocks explicitly requested by an observer retain
    /// that requirement separately.
    async fn screen_note_blocks(
        &self,
        note_blocks: Vec<ResolvedSyncNotesBlock>,
        note_updates: &mut NoteUpdateTracker,
    ) -> Result<Vec<RelevantNoteBlock>, ClientError> {
        let mut relevant_blocks = Vec::new();

        for block in note_blocks {
            let relevance =
                self.note_state_sync(note_updates, block.notes, &block.block_header).await?;

            if relevance.is_relevant() {
                relevant_blocks.push(RelevantNoteBlock {
                    block_header: block.block_header,
                    mmr_path: block.mmr_path,
                    observer_requires_block: relevance.observer_requires_block,
                });
            }
        }

        Ok(relevant_blocks)
    }

    /// Authenticates every relevant note block, then retains only blocks holding an unspent note or
    /// explicitly requested by an observer.
    ///
    /// A block which does not need to be retained is temporarily tracked so its header and MMR path
    /// are still validated against the current peaks, then immediately untracked. This avoids
    /// persisting its header and authentication nodes without accepting unauthenticated sync data.
    ///
    /// Requires `partial_mmr` to be at the chain tip forest that `relevant_blocks`' paths are
    /// relative to, which [`Self::advance_mmr`] establishes and nothing else in the pass changes.
    fn validate_and_track_note_blocks(
        relevant_blocks: Vec<RelevantNoteBlock>,
        blocks_with_unspent_notes: &BTreeSet<BlockNumber>,
        partial_mmr: &mut PartialMmr,
        partial_blockchain_updates: &mut PartialBlockchainUpdates,
    ) -> Result<(), ClientError> {
        let nodes_before: BTreeSet<InOrderIndex> = partial_mmr.nodes().map(|(k, _)| *k).collect();

        for RelevantNoteBlock {
            block_header,
            mmr_path,
            observer_requires_block,
        } in relevant_blocks
        {
            let block_pos = block_header.block_num().as_usize();
            let was_tracked = partial_mmr.is_tracked(block_pos);

            // `track` is also the authentication step: it verifies the supplied path against the
            // current peaks before mutating the partial MMR.
            partial_mmr
                .track(block_pos, block_header.commitment(), &mmr_path)
                .map_err(StoreError::MmrError)?;

            if observer_requires_block
                || blocks_with_unspent_notes.contains(&block_header.block_num())
            {
                partial_blockchain_updates.insert(block_header, true);
            } else if !was_tracked {
                partial_mmr.untrack(block_pos);
            }
        }

        // Diffed once for the whole batch, since tracked paths share internal nodes.
        partial_blockchain_updates.extend_authentication_nodes(
            partial_mmr
                .nodes()
                .filter(|(index, _)| !nodes_before.contains(index))
                .map(|(index, value)| (*index, *value)),
        );

        Ok(())
    }

    /// Extends the note tracker with newly-observed nullifiers, applies transaction inclusions, and
    /// walks each transaction to apply output-note inclusion proofs and mark same-batch-erased
    /// output notes as consumed.
    fn apply_transactions_and_nullifiers(
        &self,
        chain_tip_header: &BlockHeader,
        transactions: &[RpcTransactionRecord],
        note_updates: &mut NoteUpdateTracker,
        transaction_updates: &mut TransactionUpdateTracker,
    ) -> Result<(), ClientError> {
        note_updates.extend_nullifiers(compute_ordered_nullifiers(transactions));

        for record in transactions {
            transaction_updates
                .apply_transaction_inclusion(record, u64::from(chain_tip_header.timestamp())); //TODO: Change timestamps from u64 to u32
        }
        transaction_updates
            .apply_sync_height_update(chain_tip_header.block_num(), self.tx_discard_delta);

        for transaction in transactions {
            // Transition tracked output notes to Committed using inclusion proofs from the
            // transaction sync response. This covers output notes regardless of whether their tags
            // were tracked in the note sync.
            note_updates.apply_output_note_inclusion_proofs(&transaction.output_notes)?;

            // Detect output notes erased by same-batch note erasure.
            Self::mark_erased_notes_as_consumed(note_updates, transaction);
        }

        Ok(())
    }

    /// Marks output notes that were erased by same-batch note erasure as consumed.
    ///
    /// When a note is created and consumed in the same batch, note erasure removes it from the
    /// block body. The node reports these as erased output notes in the transaction record (note ID
    /// only, no inclusion proof). We mark them as consumed.
    fn mark_erased_notes_as_consumed(
        note_updates: &mut NoteUpdateTracker,
        transaction: &RpcTransactionRecord,
    ) {
        for note_header in &transaction.erased_output_notes {
            // Best-effort: ignore errors for notes not tracked by this client.
            let _ = note_updates.mark_erased_note_as_consumed(note_header, transaction.block_num);
        }
    }

    /// Compares the state of tracked accounts with the updates received from the node. The method
    /// Updates the `account_updates` with the details of the accounts that need to be updated.
    ///
    /// The account updates might include:
    /// * Public accounts that have been updated in the node (full or delta-based).
    /// * Network accounts that have been updated in the node and are being tracked by the client.
    /// * Private accounts that have been marked as mismatched because the current commitment
    ///   doesn't match the one received from the node. The client will need to handle these cases
    ///   as they could be a stale account state or a reason to lock the account.
    ///
    /// Returns the local states that were superseded by a same-nonce network transaction; the
    /// caller must discard the transactions that produced them.
    async fn account_state_sync(
        &self,
        account_updates: &mut AccountUpdates,
        accounts: &[AccountHeader],
        account_commitment_updates: &[(AccountId, Word)],
        block_from: BlockNumber,
        chain_tip_header: &BlockHeader,
    ) -> Result<Vec<Word>, ClientError> {
        // "Public" here includes both Public and Network accounts, since both have their state
        // stored on-chain and follow the same sync path.
        let (public_accounts, private_accounts): (Vec<_>, Vec<_>) =
            accounts.iter().partition(|header| !header.id().is_private());

        let superseded_states = self
            .sync_public_accounts(
                account_updates,
                account_commitment_updates,
                &public_accounts,
                block_from,
                chain_tip_header,
            )
            .await?;

        // If a private account commitment differs between the node and local then we verify the
        // commitment from the node before flagging the account as mismatched.
        let diverging_private_accounts: Vec<&AccountHeader> = private_accounts
            .into_iter()
            .filter(|header| {
                let local_commitment = header.to_commitment();
                account_commitment_updates
                    .iter()
                    .any(|(id, digest)| *id == header.id() && *digest != local_commitment)
            })
            .collect();

        let proven_commitments: Vec<Option<Word>> =
            futures::stream::iter(diverging_private_accounts.iter().map(|header| {
                self.verify_private_account_mismatch(
                    header.id(),
                    header.to_commitment(),
                    chain_tip_header,
                )
            }))
            .buffered(MAX_CONCURRENT_ACCOUNT_FETCHES)
            .try_collect()
            .await?;

        let mismatched_private_accounts: Vec<(AccountId, Word)> = diverging_private_accounts
            .iter()
            .zip(proven_commitments)
            .filter_map(|(header, proven_commitment)| {
                proven_commitment.map(|commitment| (header.id(), commitment))
            })
            .collect();

        account_updates.extend(AccountUpdates::new(Vec::new(), mismatched_private_accounts));

        Ok(superseded_states)
    }

    /// Verifies a private account commitment against an account witness from the node.
    ///
    /// Assumes `local_commitment` is a private account commitment that diverges from the
    /// `sync_transactions` records.
    ///
    /// Fetches the account witness via `get_account` at `chain_tip_header`'s block and checks the
    /// root it computes against `chain_tip_header`'s account root.
    ///
    /// Returns `Some(proven_commitment)` only when the proven on-chain commitment differs from
    /// `local_commitment`.
    async fn verify_private_account_mismatch(
        &self,
        account_id: AccountId,
        local_commitment: Word,
        chain_tip_header: &BlockHeader,
    ) -> Result<Option<Word>, ClientError> {
        let chain_tip = chain_tip_header.block_num();
        let (proof_block_num, proof) = self
            .rpc_api
            .get_account(account_id, GetAccountRequest::new().at(AccountStateAt::Block(chain_tip)))
            .await?;

        if proof_block_num != chain_tip {
            return Err(ClientError::ChainValidationError(format!(
                "get_account returned a proof at block {proof_block_num}, expected chain tip {chain_tip}"
            )));
        }

        let (witness, _) = proof.into_parts();
        let witness_id = witness.id();
        let proven_commitment = witness.state_commitment();
        // Verifying the witness against the chain tip's account root ties the proven commitment to
        // the synced block.
        if witness.into_proof().compute_root() != chain_tip_header.account_root() {
            return Err(ClientError::ChainValidationError(format!(
                "account witness for {account_id} does not verify against the chain tip account root"
            )));
        }

        // Check if the witness is for a different account at this prefix, the account is absent on
        // chain, or the proven commitment matches local.
        if witness_id != account_id
            || proven_commitment == Word::empty()
            || proven_commitment == local_commitment
        {
            return Ok(None);
        }

        Ok(Some(proven_commitment))
    }

    /// Queries the node for updated public accounts and populates `account_updates`.
    ///
    /// For each public account whose commitment changed, an updated snapshot is fetched with a
    /// single `get_account` call that requests every storage map and the vault.
    ///
    /// Accounts whose vault or maps are too large to fit in a single response fall back to the
    /// incremental [`PublicAccountUpdate::Delta`] path, which fetches vault and storage map updates
    /// over the synced block range.
    async fn sync_public_accounts(
        &self,
        account_updates: &mut AccountUpdates,
        commitment_updates: &[(AccountId, Word)],
        current_public_accounts: &[&AccountHeader],
        block_from: BlockNumber,
        chain_tip_header: &BlockHeader,
    ) -> Result<Vec<Word>, ClientError> {
        let local_headers: BTreeMap<AccountId, &AccountHeader> =
            current_public_accounts.iter().map(|header| (header.id(), *header)).collect();

        // Tracked accounts whose local commitment diverges from the network's. `commitment_updates`
        // holds at most one entry per account, so no account is fetched twice.
        let diverging_accounts: Vec<(AccountId, &AccountHeader)> = commitment_updates
            .iter()
            .filter_map(|(id, commitment)| {
                let local_header = local_headers.get(id).copied()?;
                (local_header.to_commitment() != *commitment).then_some((*id, local_header))
            })
            .collect();

        // Ordered fan-out: responses are folded in `commitment_updates` order regardless of
        // completion order, so the resulting updates do not depend on response timing.
        let synced_accounts: Vec<PublicAccountSync> =
            futures::stream::iter(diverging_accounts.iter().map(|(id, local_header)| {
                self.sync_public_account(*id, local_header, block_from, chain_tip_header)
            }))
            .buffered(MAX_CONCURRENT_ACCOUNT_FETCHES)
            .try_collect()
            .await?;

        // Local states that lost a same-nonce race; their transactions must be discarded.
        let mut superseded_states = Vec::new();
        for ((_, local_header), synced_account) in diverging_accounts.iter().zip(synced_accounts) {
            match synced_account {
                PublicAccountSync::Apply(public_update) => {
                    account_updates.extend(AccountUpdates::new(vec![*public_update], Vec::new()));
                },
                PublicAccountSync::Superseded => {
                    superseded_states.push(local_header.to_commitment());
                },
                PublicAccountSync::Ignore => {},
            }
        }

        Ok(superseded_states)
    }

    // SYNC PUBLIC ACCOUNTS HELPERS
    // --------------------------------------------------------------------------------------------

    /// Fetches an updated snapshot for a single public account and decides how to reconcile it
    /// against the local state.
    ///
    /// Must only be called when the local commitment for the account is known to differ from the
    /// network's, so an equal nonce always means a genuine fork.
    async fn sync_public_account(
        &self,
        account_id: AccountId,
        local_header: &AccountHeader,
        block_from: BlockNumber,
        chain_tip_header: &BlockHeader,
    ) -> Result<PublicAccountSync, ClientError> {
        let target_block_num = chain_tip_header.block_num();

        // A single request fetches the full snapshot: every storage map's entries plus the vault,
        // with the storage layout discovered server-side.
        let (proof_block_num, proof) = self
            .rpc_api
            .get_account(
                account_id,
                GetAccountRequest::new()
                    .at(AccountStateAt::Block(target_block_num))
                    .with_storage(StorageMapFetch::All)
                    .with_vault(VaultFetch::Always),
            )
            .await
            .map_err(ClientError::RpcError)?;

        let details =
            Self::validate_account_proof(proof, proof_block_num, account_id, chain_tip_header)?;

        match details
            .header
            .nonce()
            .as_canonical_u64()
            .cmp(&local_header.nonce().as_canonical_u64())
        {
            // Node is behind us: our own transaction was committed yet (will expire naturally
            // eventually).
            Ordering::Less => return Ok(PublicAccountSync::Ignore),
            // Same height but different state: our transaction definitively lost, drop it.
            Ordering::Equal => return Ok(PublicAccountSync::Superseded),
            // Node moved past us: adopt its state, built below.
            Ordering::Greater => {},
        }

        let vault_oversized = details.vault_details.too_many_assets;
        let any_map_oversized = details
            .storage_details
            .map_details
            .iter()
            .any(AccountStorageMapDetails::is_limit_exceeded);

        // TODO: we can handle vault and storage-map oversize independently. Today any oversize
        // routes the whole account through the incremental patch path, which always fetches both
        // `sync_storage_maps` and `sync_account_vault`, even if not needed.
        let public_update = if vault_oversized || any_map_oversized {
            // Some part of the account is oversized — use incremental endpoints.
            self.build_patch_update(account_id, &details, block_from, proof_block_num)
                .await?
        } else {
            // The single response carries the full vault and every map's entries.
            let account = Account::try_from(&details).map_err(ClientError::RpcError)?;
            PublicAccountUpdate::Full(account)
        };

        Ok(PublicAccountSync::Apply(Box::new(public_update)))
    }

    /// Validates that a `get_account` proof is bound to the sync target `chain_tip_header`: it must
    /// be for the requested `account_id`, at the target block, and its witness must open under the
    /// target header's account root. Returns the account details on success.
    ///
    /// # Errors
    ///
    /// Returns [`ClientError::ChainValidationError`] if:
    /// - the proof is for a different block than the sync target.
    /// - the witness is for a different account than the requested one.
    /// - the witness does not open under the sync target header's account root.
    /// - the proof carries no account details. The node returns details for every public account,
    ///   so a missing value means the response is malformed.
    fn validate_account_proof(
        proof: AccountProof,
        proof_block_num: BlockNumber,
        account_id: AccountId,
        chain_tip_header: &BlockHeader,
    ) -> Result<AccountDetails, ClientError> {
        let target_block_num = chain_tip_header.block_num();

        if proof_block_num != target_block_num {
            return Err(ClientError::ChainValidationError(format!(
                "get_account returned block {proof_block_num} but {target_block_num} was requested"
            )));
        }

        let (witness, details) = proof.into_parts();

        // The witness is internally consistent but not yet tied to the account we requested.
        if witness.id() != account_id {
            return Err(ClientError::ChainValidationError(format!(
                "get_account returned account {} but {account_id} was requested",
                witness.id()
            )));
        }

        let account_key = AccountIdKey::from(account_id).as_word();
        let state_commitment = witness.state_commitment();
        witness
            .into_proof()
            .verify_presence(&account_key, &state_commitment, &chain_tip_header.account_root())
            .map_err(|err| {
                ClientError::ChainValidationError(format!(
                    "get_account witness for account {account_id} does not open under block \
                     {target_block_num} account root: {err}"
                ))
            })?;

        details.ok_or_else(|| {
            ClientError::ChainValidationError(format!(
                "get_account returned no details for public account {account_id}"
            ))
        })
    }

    /// Builds a [`PublicAccountUpdate::Patch`] by fetching incremental storage map and vault
    /// updates over the synced range and assembling the absolute [`AccountPatch`] from them.
    async fn build_patch_update(
        &self,
        account_id: AccountId,
        details: &AccountDetails,
        block_from: BlockNumber,
        block_to: BlockNumber,
    ) -> Result<PublicAccountUpdate, ClientError> {
        let value_slot_updates: Vec<(_, Word)> = details
            .storage_details
            .header
            .slots()
            .filter(|slot| slot.slot_type() == StorageSlotType::Value)
            .map(|slot| (slot.name().clone(), slot.value()))
            .collect();

        // The lower bound is inclusive at the node, so request from `block_from + 1` to skip the
        // block whose state we already have.
        let map_info = self
            .rpc_api
            .sync_storage_maps(block_from + 1, block_to, account_id)
            .await
            .map_err(ClientError::RpcError)?;
        let vault_info = self
            .rpc_api
            .sync_account_vault(block_from + 1, block_to, account_id)
            .await
            .map_err(ClientError::RpcError)?;

        let patch = build_account_patch(
            &details.header,
            value_slot_updates,
            map_info.map_entries,
            vault_info.vault_patch,
            details.code.clone(),
        )
        .map_err(StoreError::AccountPatchError)?;

        Ok(PublicAccountUpdate::Patch {
            new_header: details.header.clone(),
            patch,
        })
    }

    /// Applies the changes received from the sync response to the notes and transactions tracked by
    /// the client and updates the `note_updates` accordingly.
    ///
    /// This method uses the callbacks provided to the [`StateSync`] component to check if the
    /// updates received are relevant to the client.
    ///
    /// The note updates might include:
    /// * New notes that we received from the node and might be relevant to the client.
    /// * Tracked expected notes that were committed in the block.
    /// * Tracked notes that were being processed by a transaction that got committed.
    /// * Tracked notes that were nullified by an external transaction.
    ///
    /// Each [`SyncedNote`] is self-contained: inclusion proof and metadata from the sync record,
    /// attachments from the sync record or a `GetNotesById` follow-up, and the body from `details`.
    ///
    /// Attachments are stored on-chain for private and public notes alike, so they are applied to
    /// the record regardless of note type.
    async fn note_state_sync(
        &self,
        note_updates: &mut NoteUpdateTracker,
        notes: BTreeMap<NoteId, SyncedNote>,
        block_header: &BlockHeader,
    ) -> Result<NoteBlockRelevance, ClientError> {
        let mut relevance = NoteBlockRelevance::default();

        for (_, mut note) in notes {
            // Observers run BEFORE the screener: they are a side-effect channel independent of the
            // Commit/Insert/Discard decision, and a failing screener must not rob them of the note.
            if !self.note_observers.is_empty() {
                for obs in &self.note_observers {
                    match obs.observe(&note).await {
                        Ok(true) => relevance.observer_requires_block = true,
                        Ok(false) => {},
                        Err(err) => {
                            tracing::warn!(
                                observer = obs.name(),
                                error = ?err,
                                "note observer failed; sync continues",
                            );
                        },
                    }
                }
            }

            // For a public note, pair its fetched body with the inclusion proof and metadata from
            // the sync record (the single source of truth) to build the candidate record.
            let public_note = note.details.take().map(|details| {
                let state = UnverifiedNoteState {
                    metadata: note.metadata,
                    inclusion_proof: note.inclusion_proof.clone(),
                }
                .into();
                InputNoteRecord::new(details, note.attachments.clone(), None, state)
            });

            let committed = note.into_committed_note();

            match self.note_screener.on_note_received(committed, public_note).await? {
                NoteUpdateAction::Commit(committed_note) => {
                    // Only mark the downloaded block header as relevant if we are talking about an
                    // input note (output notes get marked as committed but we don't need the block
                    // for anything there)
                    relevance.has_client_note |= note_updates
                        .apply_committed_note_state_transitions(&committed_note, block_header)?;
                },
                NoteUpdateAction::Insert(public_note) => {
                    relevance.has_client_note = true;

                    note_updates.apply_new_public_note(public_note, block_header)?;
                },
                NoteUpdateAction::Discard => {},
            }
        }

        Ok(relevance)
    }

    /// Collects the nullifier tags for the notes that were updated in the sync response and uses
    /// the `sync_nullifiers` endpoint to check if there are new nullifiers for these notes. It then
    /// processes the nullifiers to apply the state transitions on the note updates.
    ///
    /// The `transaction_updates` parameter will be updated to track the new discarded transactions.
    async fn nullifiers_state_sync(
        &self,
        note_updates: &mut NoteUpdateTracker,
        transaction_updates: &mut TransactionUpdateTracker,
        chain_tip: BlockNumber,
        current_block_num: BlockNumber,
    ) -> Result<(), ClientError> {
        // To receive information about added nullifiers, we reduce them to the higher 16 bits. Note
        // that besides filtering by nullifier prefixes, the node also filters by block number (it
        // only returns nullifiers from current_block_num + 1 until chain_tip).

        // Check for new nullifiers for input notes that were updated
        let nullifiers_tags: Vec<u16> =
            note_updates.unspent_nullifiers().map(|nullifier| nullifier.prefix()).collect();

        let mut new_nullifiers = self
            .rpc_api
            .sync_nullifiers(&nullifiers_tags, current_block_num + 1, chain_tip)
            .await?;

        // Discard nullifiers that are newer than the current block (this might happen if the block
        // changes between the sync_state and the check_nullifier calls)
        new_nullifiers.retain(|update| update.block_num <= chain_tip);

        // Match each nullifier update with the externally-tracked consumer account.
        let consumptions: Vec<NoteConsumption> = new_nullifiers
            .into_iter()
            .map(|update| NoteConsumption {
                external_consumer: transaction_updates
                    .external_nullifier_account(&update.nullifier),
                nullifier: update.nullifier,
                block_num: update.block_num,
            })
            .collect();

        for consumption in consumptions {
            note_updates.apply_note_consumption(
                &consumption,
                transaction_updates.committed_transactions(),
            )?;

            // Process nullifiers and track the updates of local tracked transactions that were
            // discarded because the notes that they were processing were nullified by an another
            // transaction.
            transaction_updates.apply_input_note_nullified(consumption.nullifier);
        }

        Ok(())
    }
}

// CHAIN SYNC DATA
// ================================================================================================

/// The chain data a sync fetched from the node, before any of it has been verified against the
/// client's MMR or to the store.
///
/// Built by [`StateSync::fetch_state`], extended by [`StateSync::fetch_nullifiers`] and turned into
/// a [`StateSyncUpdate`] by [`StateSync::build_update`].
pub struct ChainSyncData {
    /// The chain tip the sync started from.
    pub(crate) block_from: BlockNumber,
    /// What the node reported beyond `block_from`, or `None` when the client was already at the
    /// chain tip.
    advance: Option<ChainAdvance>,
    /// Account states the node superseded, to be applied to the transaction updates.
    superseded_states: Vec<Word>,
    /// Notes as the sync found them. A caller that wrote notes of its own after the sync input was
    /// built has to track them here, or this sync's verdicts have no record to apply to.
    pub(crate) note_updates: NoteUpdateTracker,
    transaction_updates: TransactionUpdateTracker,
    account_updates: AccountUpdates,
}

/// The part of a [`ChainSyncData`] that only exists when the node reported progress.
struct ChainAdvance {
    /// Header of the chain tip the sync advanced to.
    chain_tip_header: BlockHeader,
    /// MMR delta from `block_from` to the chain tip, excluding the chain-tip leaf.
    mmr_delta: MmrDelta,
    /// Note blocks as the node returned them. [`StateSync::derive_state_updates`] drains these into
    /// `relevant_note_blocks`, so this is empty by the time the update is built.
    note_blocks_awaiting_screening: Vec<ResolvedSyncNotesBlock>,
    /// Transaction records as the node returned them, read by [`StateSync::derive_state_updates`].
    transactions: Vec<RpcTransactionRecord>,
    /// Screened blocks holding a client-relevant note, each with its `sync_notes` MMR path.
    relevant_note_blocks: Vec<RelevantNoteBlock>,
    /// The protocol configuration active at `chain_tip_header`, when the node sent it.
    protocol_config: Option<ProtocolConfig>,
}

// HELPERS
// ================================================================================================

/// Returns the block number the given partial MMR is synced to.
pub(crate) fn block_num_from_forest(partial_mmr: &PartialMmr) -> Result<BlockNumber, ClientError> {
    Ok(u32::try_from(partial_mmr.forest().num_leaves().saturating_sub(1))
        .map_err(|_| ClientError::InvalidPartialMmrForest)?
        .into())
}

/// Groups transaction records by `(account_id, block_num)`.
fn group_txs_by_account_block(
    transaction_records: &[RpcTransactionRecord],
) -> BTreeMap<(AccountId, BlockNumber), Vec<&RpcTransactionRecord>> {
    let mut groups: BTreeMap<(AccountId, BlockNumber), Vec<&RpcTransactionRecord>> =
        BTreeMap::new();
    for record in transaction_records {
        let account_id = record.transaction_header.account_id();
        groups.entry((account_id, record.block_num)).or_default().push(record);
    }
    groups
}

/// Walks a group of transaction records in execution order.
///
/// Same-block transactions for the same account form an execution chain: each tx's
/// `final_state_commitment` is the next tx's `initial_state_commitment`. This finds the chain start
/// and walks forward, yielding each tx in execution order.
fn walk_execution_chain<'a>(
    txs: &'a [&'a RpcTransactionRecord],
) -> impl Iterator<Item = &'a RpcTransactionRecord> + 'a {
    let (self_loops, chained): (Vec<&RpcTransactionRecord>, Vec<&RpcTransactionRecord>) =
        txs.iter().copied().partition(|tx| {
            tx.transaction_header.initial_state_commitment()
                == tx.transaction_header.final_state_commitment()
        });

    let final_states: BTreeSet<Word> = chained
        .iter()
        .map(|tx| tx.transaction_header.final_state_commitment())
        .collect();

    let mut init_to_tx: BTreeMap<Word, &RpcTransactionRecord> = chained
        .iter()
        .map(|tx| (tx.transaction_header.initial_state_commitment(), *tx))
        .collect();

    let start = chained
        .iter()
        .find(|tx| !final_states.contains(&tx.transaction_header.initial_state_commitment()))
        .copied();

    assert!(start.is_some() || chained.is_empty(), "cannot walk cyclic execution chain");

    let mut current =
        start.and_then(|tx| init_to_tx.remove(&tx.transaction_header.initial_state_commitment()));
    let mut self_loops_iter = self_loops.into_iter();

    core::iter::from_fn(move || {
        if let Some(tx) = current {
            current = init_to_tx.remove(&tx.transaction_header.final_state_commitment());
            return Some(tx);
        }
        self_loops_iter.next()
    })
}

/// Derives account commitment updates from transaction records.
///
/// For each unique account, returns the `final_state_commitment` from the final transaction with
/// the highest `block_num`.
fn derive_account_commitments(
    transaction_records: &[RpcTransactionRecord],
) -> Vec<(AccountId, Word)> {
    let mut latest_by_account: BTreeMap<AccountId, (BlockNumber, Word)> = BTreeMap::new();

    for ((account_id, block_num), txs) in &group_txs_by_account_block(transaction_records) {
        let terminal_state = walk_execution_chain(txs)
            .last()
            .expect("account must have a final state")
            .transaction_header
            .final_state_commitment();

        latest_by_account
            .entry(*account_id)
            .and_modify(|(existing_block, existing_state)| {
                if *block_num > *existing_block {
                    *existing_block = *block_num;
                    *existing_state = terminal_state;
                }
            })
            .or_insert((*block_num, terminal_state));
    }

    latest_by_account
        .into_iter()
        .map(|(account_id, (_, state))| (account_id, state))
        .collect()
}

/// Returns nullifiers ordered by consuming transaction position, per account.
///
/// Groups RPC transaction records by (`account_id`, `block_num`), chains them using
/// `initial_state_commitment` / `final_state_commitment`, and collects each transaction's input
/// note nullifiers in execution order. Nullifiers from the same account are in execution order;
/// ordering across different accounts is arbitrary.
fn compute_ordered_nullifiers(transaction_records: &[RpcTransactionRecord]) -> Vec<Nullifier> {
    let mut result = Vec::new();

    for txs in group_txs_by_account_block(transaction_records).values() {
        for tx in walk_execution_chain(txs) {
            for commitment in tx.transaction_header.input_notes().iter() {
                result.push(commitment.nullifier());
            }
        }
    }

    result
}

#[cfg(all(test, feature = "testing"))]
mod tests {
    use alloc::collections::BTreeSet;
    use alloc::sync::Arc;

    use async_trait::async_trait;
    use miden_protocol::account::Account;
    use miden_protocol::assembly::DefaultSourceManager;
    use miden_protocol::asset::{Asset, FungibleAsset};
    use miden_protocol::block::{BlockNumber, BlockSignatures};
    use miden_protocol::crypto::merkle::MerklePath;
    use miden_protocol::crypto::merkle::mmr::{Forest, InOrderIndex, PartialMmr};
    use miden_protocol::note::{
        Note,
        NoteAssets,
        NoteAttachment,
        NoteAttachments,
        NoteDetails,
        NoteHeader,
        NoteMetadata,
        NoteRecipient,
        NoteStorage,
        NoteTag,
        NoteType,
        PartialNoteMetadata,
    };
    use miden_protocol::testing::account_id::{
        ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET,
        ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET,
        ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE,
        ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE,
        ACCOUNT_ID_SENDER,
    };
    use miden_protocol::transaction::{InputNotes, TransactionArgs, TransactionHeader};
    use miden_protocol::vm::AdviceMap;
    use miden_protocol::{EMPTY_WORD, Felt, Word, ZERO};
    use miden_standards::code_builder::CodeBuilder;
    use miden_standards::note::{NetworkAccountTarget, NoteExecutionHint};
    use miden_testing::{MockChainBuilder, MockTransactionInput};

    use super::*;
    use crate::store::{OutputNoteRecord, OutputNoteState};
    use crate::test_utils::mock::MockRpcApi;

    /// Mock note screener that discards all notes, for minimal test setup.
    struct MockScreener;

    #[async_trait(?Send)]
    impl OnNoteReceived for MockScreener {
        async fn on_note_received(
            &self,
            _committed_note: CommittedNote,
            _public_note: Option<InputNoteRecord>,
        ) -> Result<NoteUpdateAction, ClientError> {
            Ok(NoteUpdateAction::Discard)
        }
    }

    /// Observer that requires every matching note's block to remain tracked.
    struct AlwaysRelevantObserver;

    #[async_trait(?Send)]
    impl NoteObserver for AlwaysRelevantObserver {
        fn name(&self) -> &'static str {
            "always-relevant"
        }

        async fn observe(&self, _note: &SyncedNote) -> Result<bool, ClientError> {
            Ok(true)
        }
    }

    /// The validator configuration committed by the mock chain's genesis block header.
    fn genesis_validator_config(mock_rpc: &MockRpcApi) -> ValidatorConfig {
        mock_rpc.mock_chain.read().block_header(0).validator_config().clone()
    }

    /// The signatures the mock chain produced for `block_num`.
    fn block_signatures(mock_rpc: &MockRpcApi, block_num: BlockNumber) -> BlockSignatures {
        mock_rpc
            .mock_chain
            .read()
            .proven_blocks()
            .iter()
            .find(|block| block.header().block_num() == block_num)
            .expect("the mock chain contains the block")
            .signatures()
            .clone()
    }

    fn empty() -> StateSyncInput {
        StateSyncInput {
            accounts: vec![],
            note_tags: BTreeSet::new(),
            input_notes: vec![],
            output_notes: vec![],
            uncommitted_transactions: vec![],
        }
    }

    fn word(n: u64) -> miden_protocol::Word {
        [
            Felt::new(n).expect("test value should fit into the base field"),
            ZERO,
            ZERO,
            ZERO,
        ]
        .into()
    }

    fn header_with_account_root(header: &BlockHeader, account_root: Word) -> BlockHeader {
        BlockHeader::new(
            header.prev_block_commitment(),
            header.block_num(),
            header.chain_commitment(),
            account_root,
            header.nullifier_root(),
            header.note_root(),
            header.tx_commitment(),
            header.validator_config().clone(),
            header.fee_parameters().clone(),
            header.protocol_config_commitment(),
            header.next_protocol_config().cloned(),
            header.timestamp(),
        )
    }

    #[tokio::test]
    async fn sync_public_accounts_ignores_older_node_snapshot() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();
        let validator_config = genesis_validator_config(&rpc_api);
        let state_sync =
            StateSync::new(Arc::new(rpc_api), Arc::new(MockScreener), None, validator_config);

        // Local state is at a higher nonce than the node's snapshot (our own tx isn't committed
        // there yet), so the node snapshot must be ignored.
        let local_header =
            AccountHeader::new(account.id(), Felt::from(2u32), EMPTY_WORD, EMPTY_WORD, EMPTY_WORD);
        let current_public_accounts = vec![&local_header];
        let commitment_updates = vec![(account.id(), account.to_commitment())];
        let mut account_updates = AccountUpdates::default();

        let superseded = state_sync
            .sync_public_accounts(
                &mut account_updates,
                &commitment_updates,
                &current_public_accounts,
                BlockNumber::GENESIS,
                &chain_tip_header,
            )
            .await
            .unwrap();

        assert!(
            account_updates.updated_public_accounts().is_empty(),
            "public account sync should ignore node snapshots that are older than local"
        );
        assert!(
            superseded.is_empty(),
            "an older node snapshot must not supersede the local state"
        );
    }

    #[tokio::test]
    async fn sync_public_accounts_marks_same_nonce_mismatch_as_superseded() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();
        let validator_config = genesis_validator_config(&rpc_api);
        let state_sync =
            StateSync::new(Arc::new(rpc_api), Arc::new(MockScreener), None, validator_config);

        // Local state is at the same nonce as the node's but with a different commitment: a fork
        // where the local transaction lost the race and must be discarded.
        let local_header =
            AccountHeader::new(account.id(), account.nonce(), EMPTY_WORD, EMPTY_WORD, EMPTY_WORD);
        let current_public_accounts = vec![&local_header];
        let commitment_updates = vec![(account.id(), account.to_commitment())];
        let mut account_updates = AccountUpdates::default();

        let superseded = state_sync
            .sync_public_accounts(
                &mut account_updates,
                &commitment_updates,
                &current_public_accounts,
                BlockNumber::GENESIS,
                &chain_tip_header,
            )
            .await
            .unwrap();

        assert!(
            account_updates.updated_public_accounts().is_empty(),
            "a same-nonce fork must not overwrite the account while its tx is still pending"
        );
        assert_eq!(
            superseded,
            vec![local_header.to_commitment()],
            "the superseded local state should be reported so its transaction is discarded"
        );
    }

    // PRIVATE ACCOUNT LOCK VERIFICATION TESTS
    // --------------------------------------------------------------------------------------------

    /// Verifies that `sync_transactions` records outside the requested range `(current, chain_tip]`
    /// are rejected with a `ChainValidationError`.
    #[test]
    fn validate_transaction_records_range_rejects_out_of_range_blocks() {
        let account_id: AccountId = ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET.try_into().unwrap();
        let current = BlockNumber::from(5u32);
        let chain_tip = BlockNumber::from(10u32);

        StateSync::validate_transaction_records_range(
            &[make_tx_record(account_id, 7)],
            current,
            chain_tip,
        )
        .unwrap();

        let result = StateSync::validate_transaction_records_range(
            &[make_tx_record(account_id, 11)],
            current,
            chain_tip,
        );
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));

        let result = StateSync::validate_transaction_records_range(
            &[make_tx_record(account_id, 5)],
            current,
            chain_tip,
        );
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// A forged `sync_transactions` commitment must not lock the account when the witness proves
    /// the on-chain commitment still matches the local one.
    #[tokio::test]
    async fn verify_private_account_mismatch_ignores_forged_commitment() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();
        let on_chain_commitment = account.to_commitment();
        let validator_config = genesis_validator_config(&rpc_api);
        let state_sync =
            StateSync::new(Arc::new(rpc_api), Arc::new(MockScreener), None, validator_config);

        let result = state_sync
            .verify_private_account_mismatch(account.id(), on_chain_commitment, &chain_tip_header)
            .await
            .unwrap();

        assert!(
            result.is_none(),
            "an unproven commitment must not lock an account whose on-chain state matches local"
        );
    }

    /// When the witness proves a commitment that differs from the local one, the account is
    /// reported as mismatched with the proven commitment.
    #[tokio::test]
    async fn verify_private_account_mismatch_reports_proven_divergence() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();
        let on_chain_commitment = account.to_commitment();
        let validator_config = genesis_validator_config(&rpc_api);
        let state_sync =
            StateSync::new(Arc::new(rpc_api), Arc::new(MockScreener), None, validator_config);
        let stale_local_commitment = word(0xdead_beef);

        let result = state_sync
            .verify_private_account_mismatch(
                account.id(),
                stale_local_commitment,
                &chain_tip_header,
            )
            .await
            .unwrap();

        assert_eq!(
            result,
            Some(on_chain_commitment),
            "a proven divergence should return the proven commitment to lock with"
        );
    }

    /// A witness that doesn't verify against the chain tip's account root is a misbehaving node and
    /// must abort the sync rather than lock the account.
    #[tokio::test]
    async fn verify_private_account_mismatch_rejects_unverifiable_proof() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let real_header = rpc_api.mock_chain.read().latest_block_header();
        let validator_config = genesis_validator_config(&rpc_api);
        let state_sync =
            StateSync::new(Arc::new(rpc_api), Arc::new(MockScreener), None, validator_config);

        // Same block number so the request resolves, but a tampered account root the witness cannot
        // verify against.
        let tampered_header = BlockHeader::new(
            real_header.prev_block_commitment(),
            real_header.block_num(),
            real_header.chain_commitment(),
            word(0xbad0_bad0),
            real_header.nullifier_root(),
            real_header.note_root(),
            real_header.tx_commitment(),
            real_header.validator_config().clone(),
            real_header.fee_parameters().clone(),
            real_header.protocol_config_commitment(),
            real_header.next_protocol_config().cloned(),
            real_header.timestamp(),
        );

        let result = state_sync
            .verify_private_account_mismatch(
                account.id(),
                account.to_commitment(),
                &tampered_header,
            )
            .await;
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// A transaction committed after the sync target must remain pending. The account fetch is
    /// pinned to the target's pre-commit state.
    #[tokio::test]
    async fn sync_public_accounts_pins_account_fetch_to_sync_target() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let mut chain = builder.build().unwrap();

        // The sync target predates this transaction.
        let sync_target_header = chain.latest_block_header();
        let tx = Box::pin(
            chain
                .build_transaction(MockTransactionInput::AccountId(account.id()))
                .build()
                .unwrap()
                .execute(),
        )
        .await
        .unwrap();
        let local_header = tx.final_account().clone();
        assert_ne!(local_header.to_commitment(), account.to_commitment());
        chain.add_pending_executed_transaction(&tx).unwrap();

        let rpc_api = MockRpcApi::new(chain);
        // Commit the transaction after the target.
        rpc_api.prove_block();
        assert_eq!(
            rpc_api
                .mock_chain
                .read()
                .committed_account(account.id())
                .unwrap()
                .to_commitment(),
            local_header.to_commitment()
        );
        let validator_config = genesis_validator_config(&rpc_api);
        let state_sync =
            StateSync::new(Arc::new(rpc_api), Arc::new(MockScreener), None, validator_config);

        let current_public_accounts = vec![&local_header];
        let commitment_updates = vec![(account.id(), account.to_commitment())];
        let mut account_updates = AccountUpdates::default();

        let superseded = state_sync
            .sync_public_accounts(
                &mut account_updates,
                &commitment_updates,
                &current_public_accounts,
                BlockNumber::GENESIS,
                &sync_target_header,
            )
            .await
            .unwrap();

        assert!(superseded.is_empty(), "the transaction must not be superseded");
        assert!(
            account_updates.updated_public_accounts().is_empty(),
            "the target state must not overwrite the local account"
        );
    }

    /// Builds an honest `get_account` response for `account_id`.
    async fn get_account_proof(
        rpc_api: &MockRpcApi,
        account_id: AccountId,
    ) -> (BlockNumber, AccountProof) {
        rpc_api
            .get_account(
                account_id,
                GetAccountRequest::new()
                    .with_storage(StorageMapFetch::All)
                    .with_vault(VaultFetch::Always),
            )
            .await
            .unwrap()
    }

    /// `validate_account_proof` rejects a proof whose account differs from the requested one.
    #[tokio::test]
    async fn validate_account_proof_rejects_mismatched_account() {
        let mut builder = MockChainBuilder::new();
        let account_a = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let account_b = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();

        // An honest proof for B, validated as if A had been requested.
        let (proof_block_num, proof) = get_account_proof(&rpc_api, account_b.id()).await;
        let result = StateSync::validate_account_proof(
            proof,
            proof_block_num,
            account_a.id(),
            &chain_tip_header,
        );

        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// `validate_account_proof` rejects a witness that doesn't open under the target account root.
    #[tokio::test]
    async fn validate_account_proof_rejects_wrong_account_root() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();
        let wrong_header = header_with_account_root(&chain_tip_header, word(999));

        // An honest proof for the account, validated against a header with a bogus account root.
        let (proof_block_num, proof) = get_account_proof(&rpc_api, account.id()).await;
        let result =
            StateSync::validate_account_proof(proof, proof_block_num, account.id(), &wrong_header);

        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// `validate_account_proof` rejects a proof that carries no account details.
    #[tokio::test]
    async fn validate_account_proof_rejects_missing_details() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();

        // An otherwise honest proof, but with the account details stripped.
        let (proof_block_num, proof) = get_account_proof(&rpc_api, account.id()).await;
        let (witness, _) = proof.into_parts();
        let proof = AccountProof::new(witness, None).unwrap();
        let result = StateSync::validate_account_proof(
            proof,
            proof_block_num,
            account.id(),
            &chain_tip_header,
        );

        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// `validate_account_proof` rejects a proof reported for a block other than the sync target.
    #[tokio::test]
    async fn validate_account_proof_rejects_wrong_block() {
        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let rpc_api = MockRpcApi::new(builder.build().unwrap());
        let chain_tip_header = rpc_api.mock_chain.read().latest_block_header();

        // An honest proof, but reported at a block other than the target.
        let (proof_block_num, proof) = get_account_proof(&rpc_api, account.id()).await;
        let result = StateSync::validate_account_proof(
            proof,
            proof_block_num + 1,
            account.id(),
            &chain_tip_header,
        );

        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    // COMPUTE NULLIFIER TX ORDER TESTS
    // --------------------------------------------------------------------------------------------

    mod compute_nullifiers_tests {
        use alloc::vec;

        use miden_protocol::block::BlockNumber;
        use miden_protocol::note::Nullifier;
        use miden_protocol::transaction::{InputNoteCommitment, InputNotes, TransactionHeader};

        use super::word;
        use crate::rpc::domain::transaction::TransactionRecord as RpcTransactionRecord;

        fn make_rpc_tx(
            init_state: u64,
            final_state: u64,
            nullifier_vals: &[u64],
            block_number: u32,
        ) -> RpcTransactionRecord {
            let account_id = miden_protocol::account::AccountId::try_from(
                miden_protocol::testing::account_id::ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE,
            )
            .unwrap();

            let input_notes = InputNotes::new_unchecked(
                nullifier_vals
                    .iter()
                    .map(|v| InputNoteCommitment::from(Nullifier::from_raw(word(*v))))
                    .collect(),
            );

            RpcTransactionRecord {
                block_num: BlockNumber::from(block_number),
                transaction_header: TransactionHeader::new(
                    account_id,
                    word(init_state),
                    word(final_state),
                    input_notes,
                    vec![],
                )
                .unwrap(),
                output_notes: vec![],
                erased_output_notes: vec![],
                consumed_note_refs: vec![],
            }
        }

        #[test]
        fn chains_rpc_transactions_by_state_commitment() {
            // Chain: tx_a (state 1->2) -> tx_b (state 2->3) -> tx_c (state 3->4)
            //
            // Passed in reverse order to verify chaining uses state, not insertion order.
            let tx_a = make_rpc_tx(1, 2, &[10], 5);
            let tx_b = make_rpc_tx(2, 3, &[20], 5);
            let tx_c = make_rpc_tx(3, 4, &[30], 5);

            let result = super::super::compute_ordered_nullifiers(&[tx_c, tx_a, tx_b]);

            assert_eq!(result[0], Nullifier::from_raw(word(10)));
            assert_eq!(result[1], Nullifier::from_raw(word(20)));
            assert_eq!(result[2], Nullifier::from_raw(word(30)));
        }

        #[test]
        fn groups_independently_by_account_and_block() {
            // Account A, block 5: two chained txs.
            let tx_a1 = make_rpc_tx(1, 2, &[10], 5);
            let tx_a2 = make_rpc_tx(2, 3, &[20], 5);

            // Account A, block 6: independent chain.
            let tx_a3 = make_rpc_tx(3, 4, &[30], 6);

            // Account B, block 5: independent chain.
            let account_b = miden_protocol::account::AccountId::try_from(
                miden_protocol::testing::account_id::ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET,
            )
            .unwrap();

            let tx_b1 = RpcTransactionRecord {
                block_num: BlockNumber::from(5u32),
                transaction_header: TransactionHeader::new(
                    account_b,
                    word(100),
                    word(200),
                    InputNotes::new_unchecked(vec![InputNoteCommitment::from(
                        Nullifier::from_raw(word(40)),
                    )]),
                    vec![],
                )
                .unwrap(),
                output_notes: vec![],
                erased_output_notes: vec![],
                consumed_note_refs: vec![],
            };

            let result = super::super::compute_ordered_nullifiers(&[tx_a2, tx_b1, tx_a3, tx_a1]);

            // Nullifiers are ordered by chain position within each (account, block) group. The
            // exact global indices depend on BTreeMap iteration order of the groups.
            let pos = |val: u64| -> usize {
                result.iter().position(|n| *n == Nullifier::from_raw(word(val))).unwrap()
            };

            // Within the same group, chain order is preserved.
            assert!(pos(10) < pos(20)); // A, block 5: pos 0 < pos 1
            // Nullifiers from different groups are all present.
            assert!(result.contains(&Nullifier::from_raw(word(30)))); // A, block 6
            assert!(result.contains(&Nullifier::from_raw(word(40)))); // B, block 5
        }

        #[test]
        fn multiple_nullifiers_per_transaction_are_consecutive() {
            // Single tx consuming 3 notes — all should appear consecutively.
            let tx = make_rpc_tx(1, 2, &[10, 20, 30], 5);

            let result = super::super::compute_ordered_nullifiers(&[tx]);

            assert_eq!(result.len(), 3);
            assert!(result.contains(&Nullifier::from_raw(word(10))));
            assert!(result.contains(&Nullifier::from_raw(word(20))));
            assert!(result.contains(&Nullifier::from_raw(word(30))));
        }

        #[test]
        fn empty_input_returns_empty_vec() {
            let result = super::super::compute_ordered_nullifiers(&[]);
            assert!(result.is_empty());
        }
    }

    // DERIVE ACCOUNT COMMITMENTS TESTS
    // --------------------------------------------------------------------------------------------

    /// `derive_account_commitments` must walk the execution chain to get the final commitment when
    /// several transactions for the same account land in the same block.
    ///
    /// Test scenario:
    /// - Account A, block 5: chain 1 - 2 - 3 (older group; must be dominated by block 6).
    /// - Account A, block 6: chain 3 - 4 - 5 (final state = 5).
    /// - Account B, block 6: single tx 10 - 20 (final state = 20).
    #[test]
    fn derive_account_commitments_walks_chains_per_account() {
        let make_tx = |account: AccountId, init_state: u64, final_state: u64, block_num: u32| {
            RpcTransactionRecord {
                block_num: BlockNumber::from(block_num),
                transaction_header: TransactionHeader::new(
                    account,
                    word(init_state),
                    word(final_state),
                    InputNotes::new_unchecked(vec![]),
                    vec![],
                )
                .unwrap(),
                output_notes: vec![],
                erased_output_notes: vec![],
                consumed_note_refs: vec![],
            }
        };

        let account_a: AccountId =
            ACCOUNT_ID_REGULAR_PRIVATE_ACCOUNT_UPDATABLE_CODE.try_into().unwrap();
        let account_b: AccountId = ACCOUNT_ID_PUBLIC_FUNGIBLE_FAUCET.try_into().unwrap();

        let tx_a_b5_1 = make_tx(account_a, 1, 2, 5);
        let tx_a_b5_2 = make_tx(account_a, 2, 3, 5);
        let tx_a_b6_1 = make_tx(account_a, 3, 4, 6);
        let tx_a_b6_2 = make_tx(account_a, 4, 5, 6);
        let tx_b_b6 = make_tx(account_b, 10, 20, 6);

        // Insert transactions not ordered by execution order.
        let result = super::derive_account_commitments(&[
            tx_a_b6_1, tx_b_b6, tx_a_b5_2, tx_a_b6_2, tx_a_b5_1,
        ]);

        assert_eq!(result.len(), 2, "one entry per account");
        assert!(
            result.contains(&(account_a, word(5))),
            "account A: must walk block 6's chain, not return block 5 or an intermediate",
        );
        assert!(
            result.contains(&(account_b, word(20))),
            "account B: must be resolved independently of account A",
        );
    }

    // CONSUMED NOTE ORDERING INTEGRATION TESTS
    // --------------------------------------------------------------------------------------------

    /// Mock note screener that commits all notes matching tracked input notes. This ensures
    /// committed notes get their inclusion proofs set during sync.
    struct CommitAllScreener;

    #[async_trait(?Send)]
    impl OnNoteReceived for CommitAllScreener {
        async fn on_note_received(
            &self,
            committed_note: CommittedNote,
            _public_note: Option<InputNoteRecord>,
        ) -> Result<NoteUpdateAction, ClientError> {
            Ok(NoteUpdateAction::Commit(committed_note))
        }
    }

    /// Builds a `MockChain` where 3 notes are consumed by chained transactions in the same block.
    ///
    /// Returns the chain, the account, and the 3 notes (in consumption order).
    async fn build_chain_with_chained_consume_txs() -> (miden_testing::MockChain, Account, [Note; 3])
    {
        let sender_id: AccountId = ACCOUNT_ID_SENDER.try_into().unwrap();
        let faucet_id: AccountId = ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET.try_into().unwrap();

        let mut builder = MockChainBuilder::new();
        let account = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let account_id = account.id();

        let asset = Asset::from(FungibleAsset::new(faucet_id, 100u64).unwrap());
        let note1 = builder
            .add_p2id_note(sender_id, account_id, &[asset], NoteType::Public)
            .unwrap();
        let note2 = builder
            .add_p2id_note(sender_id, account_id, &[asset], NoteType::Public)
            .unwrap();
        let note3 = builder
            .add_p2id_note(sender_id, account_id, &[asset], NoteType::Public)
            .unwrap();

        let mut chain = builder.build().unwrap();
        chain.prove_next_block().unwrap(); // block 1: makes genesis notes consumable

        // Execute 3 chained consume transactions (state S0→S1→S2→S3).
        let mut current_account = account.clone();
        for note in [&note1, &note2, &note3] {
            let tx = Box::pin(
                chain
                    .build_transaction(MockTransactionInput::Account(current_account.clone()))
                    .unauthenticated_input_note(note.clone())
                    .build()
                    .unwrap()
                    .execute(),
            )
            .await
            .unwrap();
            current_account.apply_patch(tx.account_patch()).unwrap();
            chain.add_pending_executed_transaction(&tx).unwrap();
        }

        chain.prove_next_block().unwrap(); // block 2: all 3 txs in one block
        (chain, account, [note1, note2, note3])
    }

    /// Verifies that `consumed_tx_order` is correctly set when multiple chained transactions for
    /// the same account consume notes in the same block.
    #[tokio::test]
    async fn sync_state_sets_consumed_tx_order_for_chained_transactions() {
        use miden_protocol::note::NoteMetadata;

        let (chain, account, [note1, note2, note3]) = build_chain_with_chained_consume_txs().await;

        let mock_rpc = MockRpcApi::new(chain);
        let state_sync = StateSync::new(
            Arc::new(mock_rpc.clone()),
            Arc::new(CommitAllScreener),
            None,
            genesis_validator_config(&mock_rpc),
        );

        let genesis_peaks =
            mock_rpc.get_mmr().peaks_at(Forest::new(1).expect("valid forest")).unwrap();
        let mut partial_mmr = PartialMmr::from_peaks(genesis_peaks);

        let input_notes: Vec<InputNoteRecord> = [&note1, &note2, &note3]
            .into_iter()
            .map(|n| InputNoteRecord::from(n.clone()))
            .collect();

        let note_tags: BTreeSet<NoteTag> =
            input_notes.iter().filter_map(|n| n.metadata().map(NoteMetadata::tag)).collect();

        let account_id = account.id();
        let sync_input = StateSyncInput {
            accounts: vec![AccountHeader::from(&account)],
            note_tags,
            input_notes,
            output_notes: vec![],
            uncommitted_transactions: vec![],
        };

        let update = state_sync.sync_state(&mut partial_mmr, sync_input).await.unwrap();

        let updated_notes: Vec<_> = update.note_updates().updated_input_notes().collect();

        let find_order = |details_commitment| -> Option<u32> {
            updated_notes
                .iter()
                .find(|n| n.inner().details_commitment() == details_commitment)
                .and_then(|n| n.consumed_tx_order())
        };

        assert_eq!(find_order(note1.details_commitment()), Some(0), "note1 should have tx_order 0");
        assert_eq!(find_order(note2.details_commitment()), Some(1), "note2 should have tx_order 1");
        assert_eq!(find_order(note3.details_commitment()), Some(2), "note3 should have tx_order 2");

        // Since there are no uncommitted_transactions, these notes were consumed by a tracked
        // account via external transactions. Verify that consumer_account is populated.
        for note in &updated_notes {
            let record = note.inner();
            assert!(record.is_consumed(), "note should be in a consumed state");
            assert_eq!(
                record.consumer_account(),
                Some(account_id),
                "externally-consumed notes by a tracked account should have consumer_account set",
            );
        }
    }

    #[tokio::test]
    async fn sync_state_across_multiple_iterations_with_same_mmr() {
        // Setup: create a mock chain and advance it so there are blocks to sync.
        let mock_rpc = MockRpcApi::default();
        mock_rpc.advance_blocks(3);
        let chain_tip_1 = mock_rpc.get_chain_tip_block_num();

        let state_sync = StateSync::new(
            Arc::new(mock_rpc.clone()),
            Arc::new(MockScreener),
            None,
            genesis_validator_config(&mock_rpc),
        );

        // Build the initial PartialMmr from genesis (only 1 leaf).
        let genesis_peaks =
            mock_rpc.get_mmr().peaks_at(Forest::new(1).expect("valid forest")).unwrap();
        let mut partial_mmr = PartialMmr::from_peaks(genesis_peaks);
        assert_eq!(partial_mmr.forest().num_leaves(), 1);

        // First sync
        let update = state_sync.sync_state(&mut partial_mmr, empty()).await.unwrap();

        assert_eq!(update.block_num(), chain_tip_1);
        let forest_1 = partial_mmr.forest();
        // The MMR should contain one leaf per block (genesis + the new blocks).
        assert_eq!(forest_1.num_leaves(), chain_tip_1.as_u32() as usize + 1);

        // Second sync
        mock_rpc.advance_blocks(2);
        let chain_tip_2 = mock_rpc.get_chain_tip_block_num();

        let update = state_sync.sync_state(&mut partial_mmr, empty()).await.unwrap();

        assert_eq!(update.block_num(), chain_tip_2);
        let forest_2 = partial_mmr.forest();
        assert!(forest_2 > forest_1);
        assert_eq!(forest_2.num_leaves(), chain_tip_2.as_u32() as usize + 1);

        // Third sync (no new blocks)
        let update = state_sync.sync_state(&mut partial_mmr, empty()).await.unwrap();

        assert_eq!(update.block_num(), chain_tip_2);
        assert_eq!(partial_mmr.forest(), forest_2);
    }

    /// Builds a mock chain with a faucet that mints `num_blocks` notes, one per block. Returns the
    /// chain and the set of note tags for filtering.
    async fn build_chain_with_mint_notes(
        num_blocks: u64,
    ) -> (miden_testing::MockChain, BTreeSet<NoteTag>) {
        let mut builder = MockChainBuilder::new();
        let faucet = builder
            .add_existing_basic_faucet(
                miden_testing::Auth::BasicAuth {
                    auth_scheme: miden_protocol::account::auth::AuthScheme::Falcon512Poseidon2,
                },
                "TST",
                10_000,
                None,
            )
            .unwrap();
        let _target = builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let mut chain = builder.build().unwrap();

        // Build a real recipient so its digest has a registered preimage in the advice map;
        // `mint_and_send` → `output_note::create` emits `NOTE_BEFORE_CREATED_EVENT`, whose host
        // handler decomposes the recipient digest through the advice map and fails with
        // `MalformedRecipientData` if the preimage isn't present.
        let note_script = CodeBuilder::new()
            .compile_note_script("@note_script\npub proc main\n    nop\nend")
            .unwrap();
        let note_recipient = NoteRecipient::new(
            Word::from([1u32, 2, 3, 4]),
            note_script,
            NoteStorage::new(vec![]).unwrap(),
        );
        let recipient = note_recipient.digest();
        // `add_output_note_recipient` populates the advice map with the recipient's preimage chain
        // (RECIPIENT → [SERIAL_SCRIPT_HASH, STORAGE_COMMITMENT], etc.).
        let note_details = NoteDetails::new(NoteAssets::new(vec![]).unwrap(), note_recipient);
        let mut recipient_args = TransactionArgs::new(AdviceMap::default());
        recipient_args.add_output_note_recipient(&note_details);
        let recipient_advice = recipient_args.advice_inputs().clone();

        let tag = NoteTag::default();
        let mut faucet_account = faucet.clone();
        let mut note_tags = BTreeSet::new();

        for i in 0..num_blocks {
            let amount = 100 + i;
            let source_manager = Arc::new(DefaultSourceManager::default());
            // `mint_and_send` consumes the fungible asset's ID and value words directly:
            // `[ASSET_ID, ASSET_VALUE, tag, note_type, RECIPIENT, pad(2)]`. Both words are derived
            // in Rust from the faucet's `AssetId`, which intrinsically carries the callback flag.
            let mint_asset = FungibleAsset::new(faucet_account.id(), amount).unwrap();
            let asset_id_word = mint_asset.id().to_word();
            let asset_value_word = mint_asset.to_value_word();
            let tx_script_code = format!(
                "
                @transaction_script
                pub proc main
                    push.{recipient}
                    push.{note_type}
                    push.{tag}
                    push.{asset_value}
                    push.{asset_id}
                    call.::miden::standards::faucets::fungible::mint_and_send
                    dropw dropw dropw dropw
                end
                ",
                recipient = recipient,
                note_type = NoteType::Private as u8,
                tag = u32::from(tag),
                asset_value = asset_value_word,
                asset_id = asset_id_word,
            );
            let tx_script = CodeBuilder::with_source_manager(source_manager.clone())
                .compile_tx_script(tx_script_code)
                .unwrap();
            let tx = Box::pin(
                chain
                    .build_transaction(miden_testing::MockTransactionInput::Account(
                        faucet_account.clone(),
                    ))
                    .extend_advice_inputs(recipient_advice.clone())
                    .tx_script(tx_script)
                    .with_source_manager(source_manager)
                    .build()
                    .unwrap()
                    .execute(),
            )
            .await
            .unwrap();

            for output_note in tx.output_notes().iter() {
                note_tags.insert(output_note.metadata().tag());
            }

            faucet_account.apply_patch(tx.account_patch()).unwrap();
            chain.add_pending_executed_transaction(&tx).unwrap();
            chain.prove_next_block().unwrap();
        }

        (chain, note_tags)
    }

    /// An observer's `true` result retains a note block even when the screener discards the note
    /// and the regular note tracker therefore has no live note in that block.
    #[tokio::test]
    async fn observer_relevance_persists_discarded_note_block() {
        let (chain, note_tags) = build_chain_with_mint_notes(2).await;
        let mock_rpc = MockRpcApi::new(chain);
        let chain_tip = mock_rpc.get_chain_tip_block_num();

        let genesis_peaks =
            mock_rpc.get_mmr().peaks_at(Forest::new(1).expect("valid forest")).unwrap();
        let mut partial_mmr = PartialMmr::from_peaks(genesis_peaks);

        let validator_config = genesis_validator_config(&mock_rpc);
        let mut input = empty();
        let state_sync =
            StateSync::new(Arc::new(mock_rpc), Arc::new(MockScreener), None, validator_config)
                .with_note_observer(Arc::new(AlwaysRelevantObserver));
        input.note_tags = note_tags;

        let update = state_sync.sync_state(&mut partial_mmr, input).await.unwrap();
        let observed_non_tip_block = BlockNumber::from(1u32);

        assert!(
            update.partial_blockchain_updates().block_headers_to_store(chain_tip).any(
                |(header, is_relevant)| {
                    header.block_num() == observed_non_tip_block && *is_relevant
                }
            ),
            "an observer-relevant block must be staged as relevant"
        );
        assert!(
            partial_mmr.is_tracked(observed_non_tip_block.as_usize()),
            "an observer-relevant block must remain tracked in the partial MMR"
        );
    }

    /// Verifies that the sync correctly processes notes committed in multiple blocks (batched
    /// `SyncNotes` response) and tracks their blocks in the partial MMR.
    ///
    /// This test creates a faucet and mints notes in separate blocks (blocks 1, 2, 3),
    /// so `sync_notes` returns multiple `SyncNotesBlock`s. It then verifies:
    /// - The MMR is advanced to the chain tip
    /// - Blocks containing relevant notes are tracked in the partial MMR via `track()`
    /// - Note inclusion proofs are set correctly
    /// - Block headers for note blocks are stored
    #[tokio::test]
    async fn sync_state_tracks_note_blocks_in_mmr() {
        let (chain, note_tags) = build_chain_with_mint_notes(3).await;
        let mock_rpc = MockRpcApi::new(chain);
        let chain_tip = mock_rpc.get_chain_tip_block_num();

        // Verify the mock returns notes across multiple blocks.
        let note_blocks = mock_rpc
            .sync_notes(BlockNumber::from(0u32), chain_tip, &note_tags)
            .await
            .unwrap();
        assert!(
            note_blocks.len() >= 2,
            "expected notes in multiple blocks, got {}",
            note_blocks.len()
        );

        // Collect the block numbers that have notes.
        let note_block_nums: BTreeSet<BlockNumber> =
            note_blocks.iter().map(|b| b.block_header.block_num()).collect();

        // Test that fetch_sync_data returns note blocks with valid MMR paths that can be used to
        // track blocks in the partial MMR.
        let state_sync = StateSync::new(
            Arc::new(mock_rpc.clone()),
            Arc::new(MockScreener),
            None,
            genesis_validator_config(&mock_rpc),
        );

        let genesis_peaks =
            mock_rpc.get_mmr().peaks_at(Forest::new(1).expect("valid forest")).unwrap();
        let mut partial_mmr = PartialMmr::from_peaks(genesis_peaks);

        let sync_data = state_sync
            .fetch_sync_data(BlockNumber::GENESIS, &[], &Arc::new(note_tags.clone()))
            .await
            .unwrap()
            .expect("should have progressed past genesis");

        // Should have advanced to the chain tip.
        assert_eq!(sync_data.chain_tip_header.block_num(), chain_tip);
        assert!(!sync_data.note_blocks.is_empty(), "should have note blocks");

        // Apply the MMR delta and add the chain tip block.
        let _auth_nodes: Vec<(InOrderIndex, Word)> =
            partial_mmr.apply(sync_data.mmr_delta).map_err(StoreError::MmrError).unwrap();
        partial_mmr
            .add(sync_data.chain_tip_header.commitment(), false)
            .expect("chain tip should append to the partial MMR");

        assert_eq!(partial_mmr.forest().num_leaves(), chain_tip.as_u32() as usize + 1);

        // Track each note block using the MMR path from the sync_notes response.
        for block in &sync_data.note_blocks {
            let bn = block.block_header.block_num();
            partial_mmr
                .track(bn.as_usize(), block.block_header.commitment(), &block.mmr_path)
                .map_err(StoreError::MmrError)
                .unwrap();

            assert!(
                partial_mmr.is_tracked(bn.as_usize()),
                "block {bn} should be tracked after calling track()"
            );
        }

        // Verify the tracked blocks match the note blocks.
        for &bn in &note_block_nums {
            assert!(
                partial_mmr.is_tracked(bn.as_usize()),
                "block {bn} with notes should be tracked in partial MMR"
            );
        }
    }

    #[tokio::test]
    async fn sync_notes_with_content_fetches_inclusive_upper_bound_page() {
        let (chain, note_tags) = build_chain_with_mint_notes(10).await;
        let mock_rpc = MockRpcApi::new(chain);

        let blocks = mock_rpc
            .sync_notes_with_content(
                4_u32.into(),
                10_u32.into(),
                &note_tags,
                NoteContentFetch::PublicDetailsAndAttachments,
            )
            .await
            .expect("sync notes should succeed");

        assert_eq!(blocks.last().unwrap().block_header.block_num(), BlockNumber::from(10u32));
        assert!(
            blocks
                .iter()
                .any(|block| block.block_header.block_num() == BlockNumber::from(9u32))
        );
    }

    /// Tests that erased notes are marked as consumed when a committed transaction reports output
    /// notes that were erased by same-batch note erasure.
    ///
    /// This simulates same-batch note erasure: the transaction was committed, its header says it
    /// produced a note, but the note was erased and doesn't exist on the node.
    #[tokio::test]
    async fn erased_notes_are_marked_as_consumed() {
        // Create a public output note. It won't be in the mock chain (simulating erasure).
        let sender_id: AccountId = ACCOUNT_ID_SENDER.try_into().unwrap();
        let partial_metadata = PartialNoteMetadata::new(sender_id, NoteType::Public);
        let metadata = NoteMetadata::new(partial_metadata, &NoteAttachments::empty());
        let script = CodeBuilder::new()
            .compile_note_script("@note_script\npub proc main\n    nop\nend")
            .unwrap();
        let recipient = NoteRecipient::new(
            Word::from([1u32, 2, 3, 4]),
            script,
            NoteStorage::new(vec![]).unwrap(),
        );
        let output_note = OutputNoteRecord::new(
            recipient.digest(),
            NoteAssets::new(vec![]).unwrap(),
            metadata,
            OutputNoteState::ExpectedFull { recipient },
            BlockNumber::from(1u32),
            NoteAttachments::default(),
        );
        let note_id = output_note.id();
        let note_header = NoteHeader::new(output_note.details_commitment(), metadata);

        // Build a NoteUpdateTracker with the output note.
        let mut note_updates = NoteUpdateTracker::new(vec![], vec![output_note]);

        // Mark the note as erased (created and consumed in the same batch).
        let block_num = BlockNumber::from(3u32);
        note_updates
            .mark_erased_note_as_consumed(&note_header, block_num)
            .expect("marking erased note should succeed");

        let updated = note_updates
            .updated_output_notes()
            .find(|n| n.id() == note_id)
            .expect("output note should be in the update");

        assert!(
            updated.inner().is_consumed(),
            "output note should be consumed after erasure detection, but state is: {}",
            updated.inner().state()
        );
    }

    /// Tests that erased notes targeting a tracked network account are marked as consumed by that
    /// account through the full sync flow.
    ///
    /// Same-batch erasure scenario: a sender's transaction creates an output note targeting a
    /// network account that consumes it in the same batch, so the note never appears in the block
    /// body and the mock RPC surfaces it as erased in the transaction sync response.
    ///
    /// When the client tracks the network account, the expected end state is that an input note
    /// record is created for the erased note in a consumed state with the network account as the
    /// consumer.
    ///
    /// Ignored because the consumer extraction from an erased note's attachments is no longer wired
    /// through `mark_erased_note_as_consumed` — the RPC sync stream delivers only a bare
    /// `NoteHeader`, so the consumer is left unknown. Re-enable once attachments are delivered
    /// alongside erased notes (or the test is reworked against the new model).
    #[allow(clippy::too_many_lines)]
    #[ignore = "consumer derivation removed; see comment above"]
    #[tokio::test]
    async fn erased_notes_are_marked_as_consumed_by_network_account() {
        // Build a chain with a sender that executes one tx so `sync_transactions` returns a record.
        // The mock attaches the registered erased note header to that record.
        let mut builder = MockChainBuilder::new();
        let p2id_sender: AccountId = ACCOUNT_ID_SENDER.try_into().unwrap();
        let faucet_id: AccountId = ACCOUNT_ID_PRIVATE_FUNGIBLE_FAUCET.try_into().unwrap();
        let sender_account =
            builder.add_existing_mock_account(miden_testing::Auth::IncrNonce).unwrap();
        let sender_id = sender_account.id();

        let asset = Asset::from(FungibleAsset::new(faucet_id, 100u64).unwrap());
        let note = builder
            .add_p2id_note(p2id_sender, sender_id, &[asset], NoteType::Public)
            .unwrap();

        let mut chain = builder.build().unwrap();
        chain.prove_next_block().unwrap();

        let tx = Box::pin(
            chain
                .build_transaction(MockTransactionInput::Account(sender_account.clone()))
                .unauthenticated_input_note(note.clone())
                .build()
                .unwrap()
                .execute(),
        )
        .await
        .unwrap();
        chain.add_pending_executed_transaction(&tx).unwrap();
        chain.prove_next_block().unwrap();

        // Construct the erased note that will be marked as consumed by the network account.
        let network_account_id: AccountId =
            ACCOUNT_ID_REGULAR_PUBLIC_ACCOUNT_IMMUTABLE_CODE.try_into().unwrap();
        let target =
            NetworkAccountTarget::new(network_account_id, NoteExecutionHint::Always).unwrap();
        let attachment: NoteAttachment = target.into();
        let attachments = NoteAttachments::new(vec![attachment]).unwrap();
        let partial_metadata = PartialNoteMetadata::new(sender_id, NoteType::Public);
        let metadata = NoteMetadata::new(partial_metadata, &attachments);
        let script = CodeBuilder::new()
            .compile_note_script("@note_script\npub proc main\n    nop\nend")
            .unwrap();
        let recipient = NoteRecipient::new(
            Word::from([7u32, 8, 9, 10]),
            script,
            NoteStorage::new(vec![]).unwrap(),
        );
        let recipient_digest = recipient.digest();
        let assets = NoteAssets::new(vec![]).unwrap();

        // Output note record tracked by the sender prior to sync. The flow that builds the input
        // record from the erased header relies on this output entry being present.
        let output_note = OutputNoteRecord::new(
            recipient_digest,
            assets.clone(),
            metadata,
            OutputNoteState::ExpectedFull { recipient },
            BlockNumber::from(1u32),
            NoteAttachments::default(),
        );
        let erased_note_id = output_note.id();
        let erased_note_header = NoteHeader::new(output_note.details_commitment(), metadata);

        let mock_rpc = MockRpcApi::new(chain);
        mock_rpc.mark_note_as_erased(erased_note_header);

        // Track both the sender (so its tx is returned) and the network account (so the gating in
        // `mark_erased_note_as_consumed` allows creating the input record).
        let network_header =
            AccountHeader::new(network_account_id, ZERO, EMPTY_WORD, EMPTY_WORD, EMPTY_WORD);

        let state_sync = StateSync::new(
            Arc::new(mock_rpc.clone()),
            Arc::new(MockScreener),
            None,
            genesis_validator_config(&mock_rpc),
        );

        let genesis_peaks =
            mock_rpc.get_mmr().peaks_at(Forest::new(1).expect("valid forest")).unwrap();
        let mut partial_mmr = PartialMmr::from_peaks(genesis_peaks);

        let sync_input = StateSyncInput {
            accounts: vec![AccountHeader::from(&sender_account), network_header],
            note_tags: BTreeSet::new(),
            input_notes: vec![],
            output_notes: vec![output_note],
            uncommitted_transactions: vec![],
        };

        let update = state_sync.sync_state(&mut partial_mmr, sync_input).await.unwrap();

        // The output note record should transition to consumed.
        let updated_output = update
            .note_updates()
            .updated_output_notes()
            .find(|n| n.id() == erased_note_id)
            .expect("output note should be in the update");
        assert!(
            updated_output.inner().is_consumed(),
            "output note should be consumed, got: {}",
            updated_output.inner().state()
        );

        // A new input note record should be created with the network account as consumer.
        let input_note_update = update
            .note_updates()
            .updated_input_notes()
            .find(|n| n.id() == Some(erased_note_id))
            .expect("input note should be created from the erased output note");

        let inner = input_note_update.inner();
        assert!(
            inner.is_consumed(),
            "input note should be in a consumed state, got: {}",
            inner.state()
        );
        assert_eq!(
            inner.consumer_account(),
            Some(network_account_id),
            "consumer should be the tracked network account"
        );
    }

    /// Verifies the validations performed on `sync_chain_mmr` responses: a genuine mock-chain
    /// response passes, while each tampered variant is rejected with a `ChainValidationError`.
    #[tokio::test]
    async fn validate_chain_mmr_response_rejects_tampered_responses() {
        let mock_rpc = MockRpcApi::default();
        mock_rpc.advance_blocks(3);
        let chain_tip = mock_rpc.get_chain_tip_block_num();
        let current = BlockNumber::GENESIS;
        let validator_config = genesis_validator_config(&mock_rpc);

        let header_of =
            |block_num: u32| mock_rpc.mock_chain.read().block_header(block_num as usize);
        let chain_mmr_response = || async {
            mock_rpc.sync_chain_mmr(current, SyncTarget::CommittedChainTip).await.unwrap()
        };

        // Sanity check: the untampered response passes validation.
        let response = chain_mmr_response().await;
        StateSync::validate_chain_mmr_response(&response, current, &validator_config).unwrap();

        // The returned block header doesn't correspond to `block_to`.
        let mut response = chain_mmr_response().await;
        response.block_header = header_of(chain_tip.as_u32() - 1);
        let result = StateSync::validate_chain_mmr_response(&response, current, &validator_config);
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));

        // `block_from` doesn't match the block the sync was requested from.
        let mut response = chain_mmr_response().await;
        response.block_from = current + 1;
        let result = StateSync::validate_chain_mmr_response(&response, current, &validator_config);
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));

        // `block_to` (and its header) regress behind the client's current block.
        let mut response = chain_mmr_response().await;
        response.block_from = chain_tip;
        response.block_to = BlockNumber::GENESIS;
        response.block_header = header_of(0);
        let result =
            StateSync::validate_chain_mmr_response(&response, chain_tip, &validator_config);
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// Verifies that `sync_notes` blocks outside the requested range `(current, chain_tip]` are
    /// rejected with a `ChainValidationError`.
    #[test]
    fn validate_note_blocks_range_rejects_out_of_range_blocks() {
        let mock_rpc = MockRpcApi::default();
        mock_rpc.advance_blocks(3);
        let chain_tip = mock_rpc.get_chain_tip_block_num();
        let current = BlockNumber::GENESIS;

        // Sanity check: an empty block list passes validation.
        StateSync::validate_note_blocks_range(&[], current, chain_tip).unwrap();

        // A note block outside the requested range: genesis is always outside it.
        let genesis_note_block = ResolvedSyncNotesBlock {
            block_header: mock_rpc.mock_chain.read().block_header(0),
            mmr_path: MerklePath::new(Vec::new()),
            notes: BTreeMap::new(),
        };
        let result =
            StateSync::validate_note_blocks_range(&[genesis_note_block], current, chain_tip);
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// Verifies that `validate_chain_mmr_response` authenticates the chain tip header against the
    /// validator set, so a header served without the signatures of that set is rejected.
    #[tokio::test]
    async fn validate_chain_mmr_response_rejects_chain_tip_without_valid_signatures() {
        let mock_rpc = MockRpcApi::default();
        mock_rpc.advance_blocks(3);
        let chain_tip = mock_rpc.get_chain_tip_block_num();
        let current = BlockNumber::GENESIS;

        let validator_config = genesis_validator_config(&mock_rpc);
        assert!(!validator_config.is_empty(), "the mock chain must commit a validator set");

        // The signatures the validator set produced for the chain tip are accepted.
        let mut chain_mmr_info =
            mock_rpc.sync_chain_mmr(current, SyncTarget::CommittedChainTip).await.unwrap();
        StateSync::validate_chain_mmr_response(&chain_mmr_info, current, &validator_config)
            .unwrap();

        let parent = BlockNumber::from(chain_tip.as_u32() - 1);
        // Override the chain_mmr_info with the signatures of a different block
        chain_mmr_info.block_signatures = block_signatures(&mock_rpc, parent);
        // `validate_chain_mmr_response` returns an error when the signature verification fails
        let result =
            StateSync::validate_chain_mmr_response(&chain_mmr_info, current, &validator_config);
        assert!(
            matches!(result, Err(ClientError::ChainValidationError(_))),
            "signatures of another block must be rejected, got {result:?}"
        );
    }

    /// Verifies that `advance_mmr` rejects an MMR delta whose post-apply peaks don't match the
    /// chain tip header's chain commitment.
    #[test]
    fn advance_mmr_rejects_delta_inconsistent_with_chain_commitment() {
        let mock_rpc = MockRpcApi::default();
        mock_rpc.advance_blocks(3);
        let chain_tip = mock_rpc.get_chain_tip_block_num();

        let chain_tip_header = mock_rpc.mock_chain.read().block_header(chain_tip.as_usize());
        let genesis_partial_mmr = || {
            let peaks = mock_rpc.get_mmr().peaks_at(Forest::new(1).expect("valid forest")).unwrap();
            PartialMmr::from_peaks(peaks)
        };

        // An MMR delta consistent with the chain tip header advances the MMR...
        let full_delta = mock_rpc
            .get_mmr()
            .get_delta(Forest::new(1).unwrap(), Forest::new(chain_tip.as_usize()).unwrap())
            .unwrap();
        StateSync::advance_mmr(
            full_delta,
            &chain_tip_header,
            &mut genesis_partial_mmr(),
            &mut PartialBlockchainUpdates::default(),
        )
        .unwrap();

        // ...but one that stops short of the chain tip fails the chain commitment check.
        let truncated_delta = mock_rpc
            .get_mmr()
            .get_delta(Forest::new(1).unwrap(), Forest::new(chain_tip.as_usize() - 1).unwrap())
            .unwrap();
        let result = StateSync::advance_mmr(
            truncated_delta,
            &chain_tip_header,
            &mut genesis_partial_mmr(),
            &mut PartialBlockchainUpdates::default(),
        );
        assert!(matches!(result, Err(ClientError::ChainValidationError(_))));
    }

    /// Builds a minimal RPC transaction record at `block_num`, for range-validation tests.
    fn make_tx_record(account_id: AccountId, block_num: u32) -> RpcTransactionRecord {
        RpcTransactionRecord {
            block_num: BlockNumber::from(block_num),
            transaction_header: TransactionHeader::new(
                account_id,
                word(1),
                word(2),
                InputNotes::new_unchecked(vec![]),
                vec![],
            )
            .unwrap(),
            output_notes: vec![],
            erased_output_notes: vec![],
            consumed_note_refs: vec![],
        }
    }
}