Merge branch 'bat+fraccaman/shielded-sync-start-height' (#2902)

* bat+fraccaman/shielded-sync-start-height:
  added changelog
  [fix]: Added an optional starting block argument for shielded sync

.changelog/unreleased/improvements/2902-shielded-sync-start-height.md

@@ -0,0 +1 @@
+ - Added an optional starting block argument for shielded sync ([\#2902](https://github.com/anoma/namada/pull/2902))

crates/apps/src/lib/bench_utils.rs

@@ -1000,6 +1000,7 @@ impl BenchShieldedCtx {
                 &StdIo,
                 1,
                 None,
+                None,
                 &[spending_key.into()],
                 &[],
             ))

crates/apps/src/lib/cli.rs

@@ -3065,6 +3065,9 @@ pub mod args {
         arg_default("batch-size", DefaultFn(|| 1));
     pub const BLOCK_HEIGHT: Arg<BlockHeight> = arg("block-height");
     pub const BLOCK_HEIGHT_OPT: ArgOpt<BlockHeight> = arg_opt("height");
+    pub const BLOCK_HEIGHT_FROM_OPT: ArgOpt<BlockHeight> =
+        arg_opt("from-height");
+    pub const BLOCK_HEIGHT_TO_OPT: ArgOpt<BlockHeight> = arg_opt("to-height");
     pub const BRIDGE_POOL_GAS_AMOUNT: ArgDefault<token::DenominatedAmount> =
         arg_default(
             "pool-gas-amount",
@@ -5863,12 +5866,14 @@ pub mod args {
         fn parse(matches: &ArgMatches) -> Self {
             let ledger_address = LEDGER_ADDRESS.parse(matches);
             let batch_size = BATCH_SIZE_OPT.parse(matches);
-            let last_query_height = BLOCK_HEIGHT_OPT.parse(matches);
+            let start_query_height = BLOCK_HEIGHT_FROM_OPT.parse(matches);
+            let last_query_height = BLOCK_HEIGHT_TO_OPT.parse(matches);
             let spending_keys = SPENDING_KEYS.parse(matches);
             let viewing_keys = VIEWING_KEYS.parse(matches);
             Self {
                 ledger_address,
                 batch_size,
+                start_query_height,
                 last_query_height,
                 spending_keys,
                 viewing_keys,
@@ -5881,9 +5886,14 @@ pub mod args {
                     "Optional batch size which determines how many txs to \
                      fetch before caching locally. Default is 1.",
                 ))
-                .arg(BLOCK_HEIGHT_OPT.def().help(
+                .arg(BLOCK_HEIGHT_TO_OPT.def().help(
                     "Option block height to sync up to. Default is latest.",
                 ))
+                .arg(
+                    BLOCK_HEIGHT_FROM_OPT
+                        .def()
+                        .help("Option block height to sync from."),
+                )
                 .arg(SPENDING_KEYS.def().help(
                     "List of new spending keys with which to check note \
                      ownership. These will be added to the shielded context.",
@@ -5901,6 +5911,7 @@ pub mod args {
             ShieldedSync {
                 ledger_address: self.ledger_address,
                 batch_size: self.batch_size,
+                start_query_height: self.start_query_height,
                 last_query_height: self.last_query_height,
                 spending_keys: self
                     .spending_keys

crates/apps/src/lib/cli/client.rs

@@ -345,6 +345,7 @@ impl CliApi {
                             &client,
                             &io,
                             args.batch_size,
+                            args.start_query_height,
                             args.last_query_height,
                             &sks,
                             &vks,

crates/apps/src/lib/client/masp.rs

@@ -13,6 +13,7 @@ use namada_sdk::queries::Client;
 use namada_sdk::storage::BlockHeight;
 use namada_sdk::{display, display_line, MaybeSend, MaybeSync};
 
+#[allow(clippy::too_many_arguments)]
 pub async fn syncing<
     U: ShieldedUtils + MaybeSend + MaybeSync,
     C: Client + Sync,
@@ -22,6 +23,7 @@ pub async fn syncing<
     client: &C,
     io: &IO,
     batch_size: u64,
+    start_query_height: Option<BlockHeight>,
     last_query_height: Option<BlockHeight>,
     sks: &[ExtendedSpendingKey],
     fvks: &[ViewingKey],
@@ -37,7 +39,15 @@ pub async fn syncing<
     let logger = CliLogger::new(io);
     let sync = async move {
         shielded
-            .fetch(client, &logger, last_query_height, batch_size, sks, fvks)
+            .fetch(
+                client,
+                &logger,
+                start_query_height,
+                last_query_height,
+                batch_size,
+                sks,
+                fvks,
+            )
             .await
             .map(|_| shielded)
     };

crates/sdk/src/args.rs

@@ -1818,6 +1818,8 @@ pub struct ShieldedSync<C: NamadaTypes = SdkTypes> {
     pub ledger_address: C::TendermintAddress,
     /// The number of txs to fetch before caching
     pub batch_size: u64,
+    /// Height to start syncing from. Defaults to the correct one.
+    pub start_query_height: Option<BlockHeight>,
     /// Height to sync up to. Defaults to most recent
     pub last_query_height: Option<BlockHeight>,
     /// Spending keys used to determine note ownership

crates/sdk/src/masp.rs

@@ -702,10 +702,12 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedContext<U> {
 
     /// Fetch the current state of the multi-asset shielded pool into a
     /// ShieldedContext
+    #[allow(clippy::too_many_arguments)]
     pub async fn fetch<C: Client + Sync, IO: Io>(
         &mut self,
         client: &C,
         logger: &impl ProgressLogger<IO>,
+        start_query_height: Option<BlockHeight>,
         last_query_height: Option<BlockHeight>,
         _batch_size: u64,
         sks: &[ExtendedSpendingKey],
@@ -744,6 +746,7 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedContext<U> {
         // get the bounds on the block heights to fetch
         let start_idx =
             std::cmp::min(last_witnessed_tx, least_idx).map(|ix| ix.height);
+        let start_idx = start_query_height.or(start_idx);
         // Load all transactions accepted until this point
         // N.B. the cache is a hash map
         self.unscanned.extend(
@@ -2401,7 +2404,7 @@ impl<U: ShieldedUtils + MaybeSend + MaybeSync> ShieldedContext<U> {
             .values()
             .map(|fvk| ExtendedFullViewingKey::from(*fvk).fvk.vk)
             .collect();
-        self.fetch(client, &DefaultLogger::new(io), None, 1, &[], &fvks)
+        self.fetch(client, &DefaultLogger::new(io), None, None, 1, &[], &fvks)
             .await?;
         // Save the update state so that future fetches can be short-circuited
         let _ = self.save().await;