filecoin-project
diff --git a/‎src/common/upload-flow.ts‎
Lines changed: 7 additions & 7 deletions b/‎src/common/upload-flow.ts‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/core/upload/index.ts‎
Lines changed: 28 additions & 10 deletions b/‎src/core/upload/index.ts‎
Lines changed: 28 additions & 10 deletions
@@ -267,7 +267,7 @@ export async function performUpload(
 
   let pieceCid: PieceCID | undefined
   function getIpniAdvertisementMsg(attemptCount: number): string {
-    return `Checking for IPNI advertisement (check #${attemptCount})`
+    return `Checking for IPNI provider records (check #${attemptCount})`
   }
 
   const uploadResult = await executeUpload(synapseService, carData, rootCid, {
@@ -321,14 +321,14 @@ export async function performUpload(
           break
         }
 
-        case 'ipniAdvertisement.retryUpdate': {
+        case 'ipniProviderResults.retryUpdate': {
           const attemptCount = event.data.retryCount === 0 ? 1 : event.data.retryCount + 1
           flow.addOperation('ipni', getIpniAdvertisementMsg(attemptCount))
           break
         }
-        case 'ipniAdvertisement.complete': {
+        case 'ipniProviderResults.complete': {
           // complete event is only emitted when result === true (success)
-          flow.completeOperation('ipni', 'IPNI advertisement successful. IPFS retrieval possible.', {
+          flow.completeOperation('ipni', 'IPNI provider records found. IPFS retrieval possible.', {
             type: 'success',
             details: {
               title: 'IPFS Retrieval URLs',
@@ -341,12 +341,12 @@ export async function performUpload(
           })
           break
         }
-        case 'ipniAdvertisement.failed': {
-          flow.completeOperation('ipni', 'IPNI advertisement failed.', {
+        case 'ipniProviderResults.failed': {
+          flow.completeOperation('ipni', 'IPNI provider records not found.', {
             type: 'warning',
             details: {
               title: 'IPFS retrieval is not possible yet.',
-              content: [pc.gray(`IPNI advertisement does not exist at http://filecoinpin.contact/cid/${rootCid}`)],
+              content: [pc.gray(`IPNI provider records for this SP does not exist for the provided root CID`)],
             },
           })
           break
 
@@ -13,9 +13,9 @@ import {
 import { isSessionKeyMode, type SynapseService } from '../synapse/index.js'
 import type { ProgressEvent, ProgressEventHandler } from '../utils/types.js'
 import {
-  type ValidateIPNIAdvertisementOptions,
   type ValidateIPNIProgressEvents,
-  validateIPNIAdvertisement,
+  type WaitForIpniProviderResultsOptions,
+  waitForIpniProviderResults,
 } from '../utils/validate-ipni-advertisement.js'
 import { type SynapseUploadResult, type UploadProgressEvents, uploadToSynapse } from './synapse.js'
 
@@ -195,7 +195,7 @@ export interface UploadExecutionOptions {
      * @default: true
      */
     enabled?: boolean
-  } & Omit<ValidateIPNIAdvertisementOptions, 'onProgress'>
+  } & Omit<WaitForIpniProviderResultsOptions, 'onProgress'>
 }
 
 export interface UploadExecutionResult extends SynapseUploadResult {
@@ -230,13 +230,31 @@ export async function executeUpload(
       case 'onPieceAdded': {
         // Begin IPNI validation as soon as the piece is added and parked in the data set
         if (options.ipniValidation?.enabled !== false && ipniValidationPromise == null) {
-          const { enabled: _enabled, ...rest } = options.ipniValidation ?? {}
-          ipniValidationPromise = validateIPNIAdvertisement(rootCid, {
-            ...rest,
+          const { enabled: _enabled, expectedProviders, ...restOptions } = options.ipniValidation ?? {}
+
+          // Build validation options
+          const validationOptions: WaitForIpniProviderResultsOptions = {
+            ...restOptions,
             logger,
-            ...(options?.onProgress != null ? { onProgress: options.onProgress } : {}),
-          }).catch((error) => {
-            logger.warn({ error }, 'IPNI advertisement validation promise rejected')
+          }
+
+          // Forward progress events to caller if they provided a handler
+          if (options?.onProgress != null) {
+            validationOptions.onProgress = options.onProgress
+          }
+
+          // Determine which providers to expect in IPNI
+          // Priority: user-provided expectedProviders > current provider > none (generic validation)
+          // Note: If expectedProviders is explicitly [], we respect that (no provider expectations)
+          if (expectedProviders != null) {
+            validationOptions.expectedProviders = expectedProviders
+          } else if (synapseService.providerInfo != null) {
+            validationOptions.expectedProviders = [synapseService.providerInfo]
+          }
+
+          // Start validation (runs in parallel with other operations)
+          ipniValidationPromise = waitForIpniProviderResults(rootCid, validationOptions).catch((error) => {
+            logger.warn({ error }, 'IPNI provider results check was rejected')
             return false
           })
         }
@@ -270,7 +288,7 @@ export async function executeUpload(
     try {
       ipniValidated = await ipniValidationPromise
     } catch (error) {
-      logger.error({ error }, 'Could not validate IPNI advertisement')
+      logger.error({ error }, 'Could not validate IPNI provider records')
       ipniValidated = false
     }
   }