Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions forester-utils/src/rpc_pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ impl<R: Rpc> SolanaRpcPoolBuilder<R> {
self
}

pub fn api_key(mut self, api_key: Option<String>) -> Self {
self.api_key = api_key;
self
}

pub fn commitment(mut self, commitment: CommitmentConfig) -> Self {
self.commitment = Some(commitment);
self
Expand Down
1 change: 1 addition & 0 deletions forester/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ pub async fn run_pipeline<R: Rpc>(
let mut builder = SolanaRpcPoolBuilder::<R>::default()
.url(config.external_services.rpc_url.to_string())
.photon_url(config.external_services.indexer_url.clone())
.api_key(config.external_services.photon_api_key.clone())
.commitment(CommitmentConfig::confirmed())
.max_size(config.rpc_pool_config.max_size)
.connection_timeout_secs(config.rpc_pool_config.connection_timeout_secs)
Expand Down
5 changes: 4 additions & 1 deletion sdk-libs/client/src/indexer/photon_indexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ impl PhotonIndexer {
result: Option<T>,
) -> Result<T, IndexerError> {
if let Some(error) = error {
let error_message = error.message.unwrap_or_default();
let error_message = error
.clone()
.message
.unwrap_or_else(|| format!("Unknown API error: {:?}", error).to_string());
return Err(IndexerError::ApiError(format!(
"API error in {} (code: {:?}): {}",
context, error.code, error_message
Expand Down
4 changes: 3 additions & 1 deletion sdk-libs/client/src/rpc/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ impl LightClient {
let client = RpcClient::new_with_commitment(config.url.to_string(), commitment_config);
let retry_config = retry_config.unwrap_or_default();

let indexer = config.photon_url.map(|path| PhotonIndexer::new(path, None));
let indexer = config
.photon_url
.map(|path| PhotonIndexer::new(path, config.api_key));

let mut new = Self {
client,
Expand Down