v0.3.6-pre.009

crates/ksp-job-backfill-lib/src/discovery.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-job-backfill-lib/src/discovery.rs
-// version: 3
+// version: 4
 
 /// Network-scoped identity of one discovered transaction candidate before canonical signature decoding.
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
@@ -217,7 +217,7 @@ pub async fn discover_backfill_candidates(
         max_candidates = request.max_candidates(),
         "starting bounded Backfill candidate discovery"
     );
-    let result = discover_with_source(transport, request).await;
+    let result = discover_with_source(transport, request, std::option::Option::None).await;
     if let std::result::Result::Ok(discovery) = &result {
         ksp_logging_lib::debug!(
             target: crate::TRACING_TARGET,
@@ -234,14 +234,30 @@ pub async fn discover_backfill_candidates(
     return result;
 }
 
-async fn discover_with_source<S>(source: &S, request: &crate::BackfillRequest) -> ksp_core_lib::Result<BackfillDiscovery>
+/// Discovers one bounded candidate set while allowing cooperative cancellation of in-flight RPC futures.
+pub(crate) async fn discover_backfill_candidates_cancellable(
+    transport: &ksp_onchain_transport_lib::HttpTransportPool,
+    request: &crate::BackfillRequest,
+    cancellation: &crate::BackfillCancellationSignal,
+) -> ksp_core_lib::Result<BackfillDiscovery> {
+    return discover_with_source(transport, request, std::option::Option::Some(cancellation)).await;
+}
+
+async fn discover_with_source<S>(
+    source: &S,
+    request: &crate::BackfillRequest,
+    cancellation: std::option::Option<&crate::BackfillCancellationSignal>,
+) -> ksp_core_lib::Result<BackfillDiscovery>
 where
     S: SignaturePageSource,
 {
+    if cancellation.is_some_and(crate::BackfillCancellationSignal::is_requested) {
+        return std::result::Result::Err(cancelled_error());
+    }
     return match request.scope().kind() {
         crate::BackfillScopeKind::ExplicitSignatures => discover_explicit(request),
-        crate::BackfillScopeKind::LatestAddress | crate::BackfillScopeKind::BeforeAddress => discover_older(source, request).await,
-        crate::BackfillScopeKind::AfterAddress => discover_after(source, request).await,
+        crate::BackfillScopeKind::LatestAddress | crate::BackfillScopeKind::BeforeAddress => discover_older(source, request, cancellation).await,
+        crate::BackfillScopeKind::AfterAddress => discover_after(source, request, cancellation).await,
     };
 }
 
@@ -264,7 +280,11 @@ fn discover_explicit(request: &crate::BackfillRequest) -> ksp_core_lib::Result<B
     ));
 }
 
-async fn discover_older<S>(source: &S, request: &crate::BackfillRequest) -> ksp_core_lib::Result<BackfillDiscovery>
+async fn discover_older<S>(
+    source: &S,
+    request: &crate::BackfillRequest,
+    cancellation: std::option::Option<&crate::BackfillCancellationSignal>,
+) -> ksp_core_lib::Result<BackfillDiscovery>
 where
     S: SignaturePageSource,
 {
@@ -298,7 +318,7 @@ where
             std::option::Option::Some(request.commitment().transport()),
             request.min_context_slot(),
         );
-        let page_result = source.fetch_signature_page(request.role(), address, config).await;
+        let page_result = fetch_signature_page(source, request.role(), address, config, cancellation).await;
         let page = match page_result {
             std::result::Result::Ok(page) => page,
             std::result::Result::Err(error) => return std::result::Result::Err(error),
@@ -347,7 +367,11 @@ where
     return std::result::Result::Ok(BackfillDiscovery::new(request.network().clone(), request.scope_fingerprint(), candidates, pages_fetched, boundary));
 }
 
-async fn discover_after<S>(source: &S, request: &crate::BackfillRequest) -> ksp_core_lib::Result<BackfillDiscovery>
+async fn discover_after<S>(
+    source: &S,
+    request: &crate::BackfillRequest,
+    cancellation: std::option::Option<&crate::BackfillCancellationSignal>,
+) -> ksp_core_lib::Result<BackfillDiscovery>
 where
     S: SignaturePageSource,
 {
@@ -375,7 +399,7 @@ where
             std::option::Option::Some(request.commitment().transport()),
             request.min_context_slot(),
         );
-        let page_result = source.fetch_signature_page(request.role(), address, config).await;
+        let page_result = fetch_signature_page(source, request.role(), address, config, cancellation).await;
         let page = match page_result {
             std::result::Result::Ok(page) => page,
             std::result::Result::Err(error) => return std::result::Result::Err(error),
@@ -430,6 +454,27 @@ where
     ));
 }
 
+async fn fetch_signature_page<S>(
+    source: &S,
+    role: &ksp_onchain_transport_lib::HttpRoleName,
+    address: &ksp_core_lib::Pubkey,
+    config: ksp_onchain_transport_lib::SolanaSignaturesForAddressConfig,
+    cancellation: std::option::Option<&crate::BackfillCancellationSignal>,
+) -> ksp_core_lib::Result<std::vec::Vec<SignaturePageEntry>>
+where
+    S: SignaturePageSource,
+{
+    let future = source.fetch_signature_page(role, address, config);
+    return match cancellation {
+        std::option::Option::Some(signal) => signal.run_cancellable(future).await,
+        std::option::Option::None => future.await,
+    };
+}
+
+fn cancelled_error() -> ksp_core_lib::Error {
+    return ksp_core_lib::Error::new(crate::ERROR_CODE_BACKFILL_CANCELLED, "Backfill discovery cancelled before RPC completion");
+}
+
 fn validated_signature(value: &str) -> ksp_core_lib::Result<crate::BackfillSignature> {
     return crate::BackfillSignature::new(value.to_owned());
 }