forester: use indexer_url from config as photon_url in SolanaRpcPoolBuilder

sergeytimoshin · sergeytimoshin · commit 34b60b39b43a · 2025-06-15T22:59:24.000+01:00
diff --git a/forester-utils/src/rpc_pool.rs b/forester-utils/src/rpc_pool.rs
@@ -26,6 +26,7 @@ pub enum PoolError {
 
 pub struct SolanaConnectionManager<R: Rpc + 'static> {
     url: String,
+    photon_url: Option<String>,
     commitment: CommitmentConfig,
     // TODO: implement Rpc for SolanaConnectionManager and rate limit requests.
     _rpc_rate_limiter: Option<RateLimiter>,
@@ -36,12 +37,14 @@ pub struct SolanaConnectionManager<R: Rpc + 'static> {
 impl<R: Rpc + 'static> SolanaConnectionManager<R> {
     pub fn new(
         url: String,
+        photon_url: Option<String>,
         commitment: CommitmentConfig,
         rpc_rate_limiter: Option<RateLimiter>,
         send_tx_rate_limiter: Option<RateLimiter>,
     ) -> Self {
         Self {
             url,
+            photon_url,
             commitment,
             _rpc_rate_limiter: rpc_rate_limiter,
             _send_tx_rate_limiter: send_tx_rate_limiter,
@@ -58,7 +61,7 @@ impl<R: Rpc + 'static> bb8::ManageConnection for SolanaConnectionManager<R> {
     async fn connect(&self) -> Result<Self::Connection, Self::Error> {
         let config = LightClientConfig {
             url: self.url.to_string(),
-            photon_url: None,
+            photon_url: self.photon_url.clone(),
             commitment_config: Some(self.commitment),
             fetch_active_tree: false,
         };
@@ -86,6 +89,8 @@ pub struct SolanaRpcPool<R: Rpc + 'static> {
 #[derive(Debug)]
 pub struct SolanaRpcPoolBuilder<R: Rpc> {
     url: Option<String>,
+    photon_url: Option<String>,
+
     commitment: Option<CommitmentConfig>,
 
     max_size: u32,
@@ -110,6 +115,7 @@ impl<R: Rpc> SolanaRpcPoolBuilder<R> {
     pub fn new() -> Self {
         Self {
             url: None,
+            photon_url: None,
             commitment: None,
             max_size: 50,
             connection_timeout_secs: 15,
@@ -128,6 +134,11 @@ impl<R: Rpc> SolanaRpcPoolBuilder<R> {
         self
     }
 
+    pub fn photon_url(mut self, url: Option<String>) -> Self {
+        self.photon_url = url;
+        self
+    }
+
     pub fn commitment(mut self, commitment: CommitmentConfig) -> Self {
         self.commitment = Some(commitment);
         self
@@ -183,6 +194,7 @@ impl<R: Rpc> SolanaRpcPoolBuilder<R> {
 
         let manager = SolanaConnectionManager::new(
             url,
+            self.photon_url,
             commitment,
             self.rpc_rate_limiter,
             self.send_tx_rate_limiter,
diff --git a/forester/src/lib.rs b/forester/src/lib.rs
@@ -100,6 +100,7 @@ pub async fn run_pipeline<R: Rpc, I: Indexer + IndexerType<R> + 'static>(
 ) -> Result<()> {
     let mut builder = SolanaRpcPoolBuilder::<R>::default()
         .url(config.external_services.rpc_url.to_string())
+        .photon_url(config.external_services.indexer_url.clone())
         .commitment(CommitmentConfig::confirmed())
         .max_size(config.rpc_pool_config.max_size)
         .connection_timeout_secs(config.rpc_pool_config.connection_timeout_secs)
