oceanprotocol · mariacarmina · Mar 4, 2025 · Jan 27, 2025 · Jan 27, 2025 · Jan 28, 2025
diff --git a/docs/API.md b/docs/API.md
@@ -537,7 +537,7 @@ returns an empty object if it is valid otherwise an array with error
 | ---------- | -------- | -------- | ------------------------------------------------- |
 | command    | string   | v        | command name                                      |
 | node       | string   |          | if not present it means current node              |
-| multiAddrs | string[] |          | if passed, use this instead of peerStore & DHT     |
+| multiAddrs | string[] |          | if passed, use this instead of peerStore & DHT    |
 | id         | string   | v        | document id or did                                |
 | chainId    | number   | v        | chain id of network on which document is provided |
 | nftAddress | string   | v        | address of nft token                              |
@@ -1161,7 +1161,7 @@ returns the current indexing queue, as an array of objects
 
 ## PolicyServer Passthrough
 
-### `HTTP` POST /PolicyServerPassthrough
+### `HTTP` POST /api/services/PolicyServerPassthrough
 
 ### `P2P` command: PolicyServerPassthrough
 

diff --git a/src/@types/DDO/DDO.ts b/src/@types/DDO/DDO.ts
@@ -2,7 +2,6 @@ import { Service } from './Service'
 import { Metadata } from './Metadata'
 import { Credentials } from './Credentials'
 import { IndexedMetadata } from './IndexedMetadata'
-import { Nft } from './Nft'
 
 /**
  * DID Descriptor Object.
@@ -60,7 +59,5 @@ export interface DDO {
    */
   credentials?: Credentials
 
-  nft?: Nft
-
   indexedMetadata?: IndexedMetadata
 }
diff --git a/src/@types/DDO/IndexedMetadata.ts b/src/@types/DDO/IndexedMetadata.ts
@@ -1,3 +1,4 @@
+import { Nft } from './Nft'
 import { Event } from './Event'
 
 export type PriceType = 'fixedrate' | 'dispenser'
@@ -20,6 +21,7 @@ export interface ServiceStats {
 }
 
 export interface IndexedMetadata {
+  nft: Nft
   stats?: ServiceStats[]
   /**
    * Describes the event of last metadata event

diff --git a/src/components/Indexer/processor.ts b/src/components/Indexer/processor.ts
@@ -429,6 +429,7 @@ export class MetadataEventProcessor extends BaseEventProcessor {
         metadata
       )
       const clonedDdo = structuredClone(ddo)
+      INDEXER_LOGGER.logMessage(`clonedDdo: ${JSON.stringify(clonedDdo)}`)
       const updatedDdo = deleteIndexedMetadataIfExists(clonedDdo)
       if (updatedDdo.id !== makeDid(event.address, chainId.toString(10))) {
         INDEXER_LOGGER.error(
@@ -446,12 +447,6 @@ export class MetadataEventProcessor extends BaseEventProcessor {
       ddo.chainId = chainId
       ddo.nftAddress = event.address
       ddo.datatokens = await this.getTokenInfo(ddo.services, signer)
-      ddo.nft = await this.getNFTInfo(
-        ddo.nftAddress,
-        signer,
-        owner,
-        parseInt(decodedEventData.args[6])
-      )
 
       INDEXER_LOGGER.logMessage(
         `Processed new DDO data ${ddo.id} with txHash ${event.transactionHash} from block ${event.blockNumber}`,
@@ -573,9 +568,16 @@ export class MetadataEventProcessor extends BaseEventProcessor {
             }
           }
         }
+        ddo.indexedMetadata.nft = await this.getNFTInfo(
+          ddo.nftAddress,
+          signer,
+          owner,
+          parseInt(decodedEventData.args[6])
+        )
         if (!ddo.indexedMetadata.event) {
           ddo.indexedMetadata.event = {}
         }
+
         ddo.indexedMetadata.event.tx = event.transactionHash
         ddo.indexedMetadata.event.from = from
         ddo.indexedMetadata.event.contract = event.address
@@ -725,11 +727,14 @@ export class MetadataStateEventProcessor extends BaseEventProcessor {
       }
       INDEXER_LOGGER.logMessage(`Found did ${did} on network ${chainId}`)
 
-      if ('nft' in ddo && ddo.nft.state !== metadataState) {
+      if (
+        'nft' in ddo.indexedMetadata &&
+        ddo.indexedMetadata.nft.state !== metadataState
+      ) {
         let shortVersion = null
 
         if (
-          ddo.nft.state === MetadataStates.ACTIVE &&
+          ddo.indexedMetadata.nft.state === MetadataStates.ACTIVE &&
           [MetadataStates.REVOKED, MetadataStates.DEPRECATED].includes(metadataState)
         ) {
           INDEXER_LOGGER.logMessage(
@@ -739,16 +744,18 @@ export class MetadataStateEventProcessor extends BaseEventProcessor {
             id: ddo.id,
             chainId,
             nftAddress: ddo.nftAddress,
-            nft: {
-              state: metadataState
+            indexedMetadata: {
+              nft: {
+                state: metadataState
+              }
             }
           }
         }
 
         // We should keep it here, because in further development we'll store
         // the previous structure of the non-visible DDOs (full version)
         // in case their state changes back to active.
-        ddo.nft.state = metadataState
+        ddo.indexedMetadata.nft.state = metadataState
         if (shortVersion) {
           ddo = shortVersion
         }

diff --git a/src/components/core/handler/ddoHandler.ts b/src/components/core/handler/ddoHandler.ts
@@ -239,7 +239,7 @@
        try {
          encryptedDocument = ethers.getBytes(task.encryptedDocument)
          flags = Number(task.flags)
          documentHash = task.documentHash
        } catch (error) {
          CORE_LOGGER.logMessage(`Decrypt DDO: error ${error}`, true)
          return {
@@ -756,7 +756,8 @@
           credentials: ddoData.credentials,
           indexedMetadata: {
             stats: ddoData.indexedMetadata.stats,
-            event: ddoData.indexedMetadata.event
+            event: ddoData.indexedMetadata.event,
+            nft: ddoData.indexedMetadata.nft
           }
         }
 

diff --git a/src/components/core/handler/downloadHandler.ts b/src/components/core/handler/downloadHandler.ts
@@ -50,8 +50,8 @@ export function isOrderingAllowedForAsset(asset: DDO): OrdableAssetResponse {
       reason: `Asset provided is either null, either undefined ${asset}`
     }
   } else if (
-    asset.nft &&
-    !(asset.nft.state in [MetadataStates.ACTIVE, MetadataStates.UNLISTED])
+    asset.indexedMetadata.nft &&
+    !(asset.indexedMetadata.nft.state in [MetadataStates.ACTIVE, MetadataStates.UNLISTED])
   ) {
     return {
       isOrdable: false,

diff --git a/src/components/database/ElasticSearchDatabase.ts b/src/components/database/ElasticSearchDatabase.ts
@@ -471,7 +471,7 @@ export class ElasticsearchDdoDatabase extends AbstractDdoDatabase {
 
   getDDOSchema(ddo: Record<string, any>) {
     let schemaName: string | undefined
-    if (ddo.nft?.state !== 0) {
+    if (ddo.indexedMetadata?.nft?.state !== 0) {
       schemaName = 'op_ddo_short'
     } else if (ddo.version) {
       schemaName = `op_ddo_v${ddo.version}`
@@ -487,7 +487,12 @@ export class ElasticsearchDdoDatabase extends AbstractDdoDatabase {
   }
 
   async validateDDO(ddo: Record<string, any>): Promise<boolean> {
-    if (ddo.nft?.state !== 0) {
+    if ('indexedMetadata' in ddo && ddo.indexedMetadata.nft?.state !== 0) {
+      // Skipping validation for short DDOs as it currently doesn't work
+      // TODO: DDO validation needs to be updated to consider the fields required by the schema
+      // See github issue: https://github.com/oceanprotocol/ocean-node/issues/256
+      return true
+    } else if ('nft' in ddo && ddo.nft?.state !== 0) {
       return true
     } else {
       const validation = await validateObject(ddo, ddo.chainId, ddo.nftAddress)

diff --git a/src/components/database/TypenseDatabase.ts b/src/components/database/TypenseDatabase.ts
@@ -371,7 +371,7 @@ export class TypesenseDdoDatabase extends AbstractDdoDatabase {
   getDDOSchema(ddo: Record<string, any>): TypesenseSchema {
     // Find the schema based on the DDO version OR use the short DDO schema when state !== 0
     let schemaName: string
-    if (ddo.nft?.state !== 0) {
+    if (ddo.indexedMetadata?.nft?.state !== 0) {
       schemaName = 'op_ddo_short'
     } else if (ddo.version) {
       schemaName = `op_ddo_v${ddo.version}`
@@ -387,11 +387,13 @@ export class TypesenseDdoDatabase extends AbstractDdoDatabase {
   }
 
   async validateDDO(ddo: Record<string, any>): Promise<boolean> {
-    if (ddo.nft?.state !== 0) {
+    if ('indexedMetadata' in ddo && ddo.indexedMetadata.nft?.state !== 0) {
       // Skipping validation for short DDOs as it currently doesn't work
       // TODO: DDO validation needs to be updated to consider the fields required by the schema
       // See github issue: https://github.com/oceanprotocol/ocean-node/issues/256
       return true
+    } else if ('nft' in ddo && ddo.nft?.state !== 0) {
+      return true
     } else {
       const validation = await validateObject(ddo, ddo.chainId, ddo.nftAddress)
       if (validation[0] === true) {

diff --git a/src/components/httpRoutes/index.ts b/src/components/httpRoutes/index.ts
@@ -12,6 +12,7 @@ import { queueRoutes } from './queue.js'
 // import { getConfiguration } from '../../utils/config.js'
 import { jobsRoutes } from './jobs.js'
 import { addMapping, allRoutesMapping, findPathName } from './routeUtils.js'
+import { PolicyServerPassthroughRoute } from './policyServer.js'
 
 export * from './getOceanPeers.js'
 
@@ -57,7 +58,8 @@ httpRoutes.use(computeRoutes)
 httpRoutes.use(queueRoutes)
 // running jobs
 httpRoutes.use(jobsRoutes)
-
+// policy server passthrough
+httpRoutes.use(PolicyServerPassthroughRoute)
 export function getAllServiceEndpoints() {
   httpRoutes.stack.forEach(addMapping.bind(null, []))
   const data: any = {}

diff --git a/src/components/httpRoutes/routeUtils.ts b/src/components/httpRoutes/routeUtils.ts
@@ -174,6 +174,11 @@ routesNames.set('indexQueue', {
   method: 'get'
 })
 
+routesNames.set('PolicyServerPassthrough', {
+  path: `${SERVICES_API_BASE_PATH}/PolicyServerPassthrough`,
+  method: 'post'
+})
+
 export function addMapping(path: any, layer: any) {
   if (layer.route) {
     layer.route.stack.forEach(addMapping.bind(null, path.concat(split(layer.route.path))))

diff --git a/src/components/policyServer/index.ts b/src/components/policyServer/index.ts
@@ -24,7 +24,11 @@ export class PolicyServer {
       return { success: true, message: '', httpStatus: 0 }
     }
     if (response.status === 200) {
-      return { success: true, message: '', httpStatus: response.status }
+      return {
+        success: true,
+        message: await response.text(),
+        httpStatus: response.status
+      }
     }
     return { success: false, message: await response.text(), httpStatus: response.status }
   }

diff --git a/src/test/data/assets.ts b/src/test/data/assets.ts
@@ -47,17 +47,16 @@ export const downloadAsset = {
     owner: '',
     created: ''
   },
-  purgatory: {
-    state: false
-  },
-  datatokens: [] as any,
   stats: {
-    allocated: 0,
     orders: 0,
     price: {
       value: '0'
     }
-  }
+  },
+  purgatory: {
+    state: false
+  },
+  datatokens: [] as any
 }
 
 const nftLevelCredentials: Credentials = {

diff --git a/src/test/data/ddo.ts b/src/test/data/ddo.ts
@@ -1,24 +1,35 @@
 export const ddo = {
   hashType: 'sha256',
   '@context': ['https://w3id.org/did/v1'],
-  id: 'did:op:fa0e8fa9550e8eb13392d6eeb9ba9f8111801b332c8d2345b350b3bc66b379d7',
-  nftAddress: '0xBB1081DbF3227bbB233Db68f7117114baBb43656',
+  id: 'did:op:b5ef03b7f0d148cde2942c8a330625d4fc71dd32b67a0093da24fcb9a4439887',
+  nftAddress: '0xca63894B1c911515F1C034BE3509AfC008B42d83',
   version: '4.1.0',
   chainId: 137,
   metadata: {
     created: '2022-12-30T08:40:06Z',
     updated: '2022-12-30T08:40:06Z',
     type: 'dataset',
-    name: 'DEX volume in details',
+    name: 'ETH/USDT orderbook',
     description:
-      'Volume traded and locked of Decentralized Exchanges (Uniswap, Sushiswap, Curve, Balancer, ...), daily in details',
-    tags: ['index', 'defi', 'tvl'],
-    author: 'DEX',
+      'Real time ETH/USDT orderbook\n\nTo take the bid orders, access data.bids array\nTo take the ask orders, access data.asks array\n\nResponse schema:\n\n```json\n{\n    "code":"200000",\n    "data":\n        {\n            "time":1665865828392,\n            "sequence":"357821345",\n            "bids":\n                [\n                    ["1280","0.00078381"],\n                    ["1279.9","0.02901545"],\n                    ....\n                ],\n            "asks":\n                [\n                    ["1280.2","0.0288382"],\n                    ["1280.3","0.00167897"],\n                    ...\n                ]\n        }\n}\n```\n\nAccess is permited for 1 day after buying.',
+    tags: ['defi', 'orderbook'],
+    author: '0x4Ab0C24005c410111e21aE16Df5e19180fAD0f6a',
     license: 'https://market.oceanprotocol.com/terms',
     additionalInformation: {
       termsAndConditions: true
     }
-  }
+  },
+  services: [
+    {
+      id: '24654b91482a3351050510ff72694d88edae803cf31a5da993da963ba0087648',
+      type: 'access',
+      files:
+        '0x04beba2f90639ff7559618160df5a81729904022578e6bd5f60c3bebfe5cb2aca59d7e062228a98ed88c4582c290045f47cdf3824d1c8bb25b46b8e10eb9dc0763ce82af826fd347517011855ce1396ac94af8cc6f29b78012b679cb78a594d9064b6f6f4a8229889f0bb53262b6ab62b56fa5c608ea126ba228dd0f87290c0628fe07023416280c067beb01a42d0a4df95fdb5a857f1f59b3e6a13b0ae4619080369ba5bede6c7beff6afc7fc31c71ed8100e7817d965d1f8f1abfaace3c01f0bd5d0127df308175941088a1f120a4d9a0290be590d65a7b4de01ae1efe24286d7a06fadeeafba83b5eab25b90961abf1f24796991f06de6c8e1c2357fbfb31f484a94e87e7dba80a489e12fffa1adde89f113b4c8c4c8877914911a008dbed0a86bdd9d14598c35894395fb4a8ea764ed2f9459f6acadac66e695b3715536338f6cdee616b721b0130f726c78ca60ec02fc86c',
+      datatokenAddress: '0xfF4AE9869Cafb5Ff725f962F3Bbc22Fb303A8aD8',
+      serviceEndpoint: 'https://v4.provider.polygon.oceanprotocol.com',
+      timeout: 0
+    }
+  ]
 }
 export const genericAlgorithm = {
   '@context': ['https://w3id.org/did/v1'],

diff --git a/src/test/integration/download.test.ts b/src/test/integration/download.test.ts
@@ -56,6 +56,7 @@ describe('Should run a complete node flow.', () => {
   let publishedDataset: any
   let actualDDO: any
   let indexer: OceanIndexer
+  let anotherConsumer: ethers.Wallet
 
   const mockSupportedNetworks: RPCS = getMockSupportedNetworks()
   const serviceId = '0'
@@ -98,6 +99,10 @@ describe('Should run a complete node flow.', () => {
     }
 
     provider = new JsonRpcProvider('http://127.0.0.1:8545')
+    anotherConsumer = new ethers.Wallet(
+      ENVIRONMENT_VARIABLES.NODE2_PRIVATE_KEY.value,
+      provider
+    )
 
     publisherAccount = (await provider.getSigner(0)) as Signer
     consumerAccount = (await provider.getSigner(1)) as Signer
@@ -191,6 +196,7 @@ describe('Should run a complete node flow.', () => {
       id: publishedDataset.ddo.id
     }
     const response = await new GetDdoHandler(oceanNode).handle(getDDOTask)
+    console.log('get ddo: ', JSON.stringify(response))
     actualDDO = await streamToObject(response.stream as Readable)
     assert(actualDDO.id === publishedDataset.ddo.id, 'DDO id not matching')
   })
@@ -294,7 +300,7 @@ describe('Should run a complete node flow.', () => {
         serviceId,
         transferTxId: orderTxId,
         nonce: Date.now().toString(),
-        consumerAddress: '0xBE5449a6A97aD46c8558A3356267Ee5D2731ab57',
+        consumerAddress: await anotherConsumer.getAddress(),
         signature: '0xBE5449a6',
         command: PROTOCOL_COMMANDS.DOWNLOAD
       }