Merge branch 'bp/maint-101.1/pr-4785' (#4966)

* bp/maint-101.1/pr-4785:
  changelog: add #4966
  Fix block index not being properly used

Author: tzemanovic

.changelog/unreleased/improvements/4966-improve-shielded-sync.md

@@ -0,0 +1,2 @@
+- Partially backported PR#4785 to improve performance of shielded sync.
+  ([\#4966](https://github.com/anoma/namada/pull/4966))

Cargo.lock

@@ -172,7 +172,6 @@ ics23 = "0.12"
 usize-set = { version = "0.10", features = ["serialize-borsh", "serialize-serde"] }
 impl-num-traits = "0.2"
 indexmap = { package = "nam-indexmap", version = "2.7.1-nam.0", features = ["borsh-schema", "serde"] }
-init-once = "0.6"
 itertools = "0.14"
 jubjub = { package = "nam-jubjub", version = "0.10.1-nam.0" }
 k256 = { version = "0.13", default-features = false, features = ["ecdsa", "pkcs8", "precomputed-tables", "serde", "std"]}

Cargo.toml

@@ -107,7 +107,6 @@ ethers.workspace = true
 eyre.workspace = true
 fd-lock = { workspace = true, optional = true }
 futures.workspace = true
-init-once.workspace = true
 itertools.workspace = true
 jubjub = { workspace = true, optional = true }
 lazy_static.workspace = true

crates/sdk/Cargo.toml

@@ -20,7 +20,7 @@ use namada_token::masp::utils::{
 };
 use namada_tx::event::MaspEvent;
 use namada_tx::{IndexedTx, Tx};
-use tokio::sync::Semaphore;
+use tokio::sync::{OnceCell, Semaphore};
 
 use crate::error::{Error, QueryError};
 use crate::masp::{extract_masp_tx, get_indexed_masp_events_at_height};
@@ -234,7 +234,7 @@ struct IndexerMaspClientShared {
     indexer_api: reqwest::Url,
     /// Bloom filter to help avoid fetching block heights
     /// with no MASP notes.
-    block_index: init_once::InitOnce<Option<(BlockHeight, xorf::BinaryFuse16)>>,
+    block_index: OnceCell<Option<(BlockHeight, xorf::BinaryFuse16)>>,
     /// Maximum number of concurrent fetches.
     max_concurrent_fetches: usize,
 }
@@ -273,13 +273,9 @@ impl IndexerMaspClient {
             indexer_api,
             max_concurrent_fetches,
             semaphore: Semaphore::new(max_concurrent_fetches),
-            block_index: {
-                let mut index = init_once::InitOnce::new();
-                if !using_block_index {
-                    index.init(|| None);
-                }
-                index
-            },
+            block_index: OnceCell::new_with(
+                (!using_block_index).then_some(None),
+            ),
         });
         Self { client, shared }
     }
@@ -428,15 +424,11 @@ impl MaspClient for IndexerMaspClient {
             )));
         }
 
-        let maybe_block_index = self
+        let maybe_block_index: &Option<_> = self
             .shared
             .block_index
-            .try_init_async(async {
-                let _permit = self.shared.semaphore.acquire().await.unwrap();
-                self.last_block_index().await.ok()
-            })
-            .await
-            .and_then(Option::as_ref);
+            .get_or_init(|| async { self.last_block_index().await.ok() })
+            .await;
 
         let mut fetches = vec![];
         loop {