Update publisherTrustedAlgorithmPublishers and publisherTrustedAlgorithms (#950)

* Update publisherTrustedAlgorithmPublishers and publisherTrustedAlgorithm logic for allowing all datasets DIDs or algorithm DIDs.

* tweak.

* Refactor logic.

* Added tests for new trusted algorithm flow.

* Fix lint.

* tweaks.

* Fix.

* Updated test.

* Fix lint.

* Fix key.

* Fix init response.

* Fix await

* Fix variable of results.

* Updated test.

* Added tests back.

* Print start compute resp.

* revert prints.

* Fix previous config and stop indexer threads.

* Fix lint.

* print compute resp.

* Cancel expired locks

* Bring back tests.

* tweak.

* Update branch name for cli tests.

* Added docker envs for system tests job.

* remove address file.

* update cli branch.

* Update ddo.js version.

* Fix credential type according to latest ddo.js update.

* fix lint.

---------

Co-authored-by: giurgiur99 <giurgiur99@gmail.com>

Author: mariacarmina

.github/workflows/ci.yml

@@ -282,7 +282,7 @@ jobs:
         with:
           repository: 'oceanprotocol/ocean-cli'
           path: 'ocean-cli'
-          ref: 'main'
+          ref: 'fix-tests-for-node'
       - name: Setup Ocean CLI
         working-directory: ${{ github.workspace }}/ocean-cli
         run: |

package-lock.json

@@ -73,7 +73,7 @@
     "@libp2p/websockets": "^8.1.1",
     "@multiformats/multiaddr": "^10.2.0",
     "@oceanprotocol/contracts": "^2.3.0",
-    "@oceanprotocol/ddo-js": "^0.0.6",
+    "@oceanprotocol/ddo-js": "^0.1.0",
     "@types/lodash.clonedeep": "^4.5.7",
     "axios": "^1.8.4",
     "base58-js": "^2.0.0",

package.json

@@ -86,16 +86,27 @@ export async function validateAlgoForDataset(
 
     if (algoDID) {
       if (
-        // if not set allow them all
+        // if not set deny them all
         (!Array.isArray(compute.publisherTrustedAlgorithms) ||
           compute.publisherTrustedAlgorithms.length === 0) &&
         (!Array.isArray(compute.publisherTrustedAlgorithmPublishers) ||
           compute.publisherTrustedAlgorithmPublishers.length === 0)
+      ) {
+        return false
+      }
+
+      if (
+        compute.publisherTrustedAlgorithms.includes('*') &&
+        compute.publisherTrustedAlgorithmPublishers.includes('*')
       ) {
         return true
       }
-      // if is set only allow if match
-      if (compute.publisherTrustedAlgorithms) {
+
+      if (
+        Array.isArray(compute.publisherTrustedAlgorithms) &&
+        compute.publisherTrustedAlgorithms.length > 0 &&
+        !compute.publisherTrustedAlgorithms.includes('*')
+      ) {
         const trustedAlgo = compute.publisherTrustedAlgorithms.find(
           (algo: any) => algo.did === algoDID
         )
@@ -107,7 +118,11 @@ export async function validateAlgoForDataset(
         }
         return false
       }
-      if (compute.publisherTrustedAlgorithmPublishers) {
+      if (
+        Array.isArray(compute.publisherTrustedAlgorithmPublishers) &&
+        compute.publisherTrustedAlgorithmPublishers.length > 0 &&
+        !compute.publisherTrustedAlgorithmPublishers.includes('*')
+      ) {
         const algoDDO = await new FindDdoHandler(oceanNode).findAndFormatDdo(algoDID)
         const algoInstance = DDOManager.getDDOClass(algoDDO)
         const { nftAddress } = algoInstance.getDDOFields()

src/components/core/compute/utils.ts

@@ -1,4 +1,4 @@
-import { Credentials } from '@oceanprotocol/ddo-js'
+import { Credentials, CREDENTIALS_TYPES } from '@oceanprotocol/ddo-js'
 
 export const downloadAsset = {
   '@context': ['https://w3id.org/did/v1'],
@@ -62,17 +62,17 @@ export const downloadAsset = {
 const nftLevelCredentials: Credentials = {
   allow: [
     {
-      type: 'address',
+      type: CREDENTIALS_TYPES.ADDRESS,
       values: ['0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e']
     },
     {
-      type: 'address',
+      type: CREDENTIALS_TYPES.ADDRESS,
       values: ['0xA78deb2Fa79463945C247991075E2a0e98Ba7A09']
     }
   ],
   deny: [
     {
-      type: 'address',
+      type: CREDENTIALS_TYPES.ADDRESS,
       values: ['0x02354A1F160A3fd7ac8b02ee91F04104440B28E7']
     }
   ]
@@ -82,7 +82,7 @@ const serviceLevelCredentials: Credentials = {
   allow: [],
   deny: [
     {
-      type: 'address',
+      type: CREDENTIALS_TYPES.ADDRESS,
       values: ['0xA78deb2Fa79463945C247991075E2a0e98Ba7A09']
     }
   ]