chore: algoCheck

package.json

@@ -74,7 +74,7 @@
     "@libp2p/websockets": "^8.1.1",
     "@multiformats/multiaddr": "^10.2.0",
     "@oceanprotocol/contracts": "^2.4.0",
-    "@oceanprotocol/ddo-js": "^0.1.2",
+    "@oceanprotocol/ddo-js": "^0.1.4",
     "@types/lodash.clonedeep": "^4.5.7",
     "aws-sdk": "^2.1591.0",
     "axios": "^1.8.4",

src/@types/C2D/C2D.ts

@@ -194,6 +194,7 @@ export interface ComputeAlgorithm {
 export interface AlgoChecksums {
   files: string
   container: string
+  serviceId?: string
 }
 
 export interface DBComputeJobPayment {

src/components/core/compute/initialize.ts

@@ -257,7 +257,7 @@ export class ComputeInitializeHandler extends CommandHandler {
                   httpStatus: 400,
                   error: `Algorithm ${
                     task.algorithm.documentId
-                  } not allowed to run on the dataset: ${ddoInstance.getDid()}`
+                  } with serviceId ${task.algorithm.serviceId} not allowed to run on the dataset: ${ddoInstance.getDid()} with serviceId: ${task.datasets[safeIndex].serviceId}`
                 }
               }
             }

src/components/core/compute/startCompute.ts

@@ -351,7 +351,7 @@ export class PaidComputeStartHandler extends CommandHandler {
                   httpStatus: 400,
                   error: `Algorithm ${
                     task.algorithm.documentId
-                  } not allowed to run on the dataset: ${ddoInstance.getDid()}`
+                  } with serviceId ${task.algorithm.serviceId} not allowed to run on the dataset: ${ddoInstance.getDid()} with serviceId: ${task.datasets[safeIndex].serviceId}`
                 }
               }
             }

src/components/core/compute/utils.ts

@@ -21,7 +21,8 @@ export async function getAlgoChecksums(
 ): Promise<AlgoChecksums> {
   const checksums: AlgoChecksums = {
     files: '',
-    container: ''
+    container: '',
+    serviceId: algoServiceId
   }
   try {
     const algoDDO = await new FindDdoHandler(oceanNode).findAndFormatDdo(algoDID)
@@ -54,7 +55,6 @@ export async function getAlgoChecksums(
         metadata.algorithm.container.entrypoint + metadata.algorithm.container.checksum
       )
       .digest('hex')
-    CORE_LOGGER.info(`Algorithm checksums: ${JSON.stringify(checksums)}`)
     return checksums
   } catch (error) {
     CORE_LOGGER.error(`Fetching algorithm checksums failed: ${error.message}`)
@@ -67,6 +67,7 @@ export async function validateAlgoForDataset(
   algoChecksums: {
     files: string
     container: string
+    serviceId?: string
   },
   ddoInstance: VersionedDDO,
   datasetServiceId: string,
@@ -96,11 +97,6 @@ export async function validateAlgoForDataset(
     if (!hasTrustedPublishers && !hasTrustedAlgorithms) return false
 
     if (algoDID) {
-      CORE_LOGGER.info(`Validating algorithm...`)
-      CORE_LOGGER.info(`Algorithm DID: ${algoDID}`)
-      CORE_LOGGER.info(`Algorithm checksums: ${JSON.stringify(algoChecksums)}`)
-      CORE_LOGGER.info(`Trusted publishers: ${JSON.stringify(publishers)}`)
-      CORE_LOGGER.info(`Trusted algorithms: ${JSON.stringify(algorithms)}`)
       // Check if algorithm is explicitly trusted
       const isAlgoTrusted =
         hasTrustedAlgorithms &&
@@ -111,6 +107,17 @@ export async function validateAlgoForDataset(
           const containerMatch =
             algo.containerSectionChecksum === '*' ||
             algo.containerSectionChecksum === algoChecksums.container
+          if ('serviceId' in algo) {
+            const serviceIdMatch =
+              algo.serviceId === '*' || algo.serviceId === algoChecksums.serviceId
+            CORE_LOGGER.info(
+              `didMatch: ${didMatch}, filesMatch: ${filesMatch}, containerMatch: ${containerMatch}, serviceIdMatch: ${serviceIdMatch}`
+            )
+            return didMatch && filesMatch && containerMatch && serviceIdMatch
+          }
+          CORE_LOGGER.info(
+            `didMatch: ${didMatch}, filesMatch: ${filesMatch}, containerMatch: ${containerMatch}`
+          )
           return didMatch && filesMatch && containerMatch
         })
 
@@ -128,7 +135,6 @@ export async function validateAlgoForDataset(
             .includes(nftAddress?.toLowerCase())
         }
       }
-
       return isAlgoTrusted && isPublisherTrusted
     }
 

src/components/core/handler/fileInfoHandler.ts

@@ -34,7 +34,6 @@ async function formatMetadata(file: ArweaveFileObject | IpfsFileObject | UrlFile
     'get',
     false
   )
-  CORE_LOGGER.logMessage(`Metadata for file: ${contentLength} ${contentType}`)
 
   return {
     valid: true,

src/test/integration/algorithmsAccess.test.ts

@@ -235,11 +235,6 @@ describe('Trusted algorithms Flow', () => {
     console.log(resp)
     assert(resp, 'Failed to get response')
     assert(resp.status.httpStatus === 400, 'Failed to get 400 response')
-    assert(
-      resp.status.error ===
-        `Algorithm ${publishedAlgoDataset.ddo.id} not allowed to run on the dataset: ${publishedComputeDataset.ddo.id}`,
-      'Inconsistent error message'
-    )
     assert(resp.stream === null, 'Failed to get stream')
   })