feat: add asset edit functionality

src/@types/Nautilus.ts

@@ -12,17 +12,11 @@ import {
   NftCreateDataWithoutOwner,
   PricingConfig
 } from './Publish'
-import { NautilusDDO } from '../Nautilus/Asset/NautilusDDO'
 
 export interface NautilusOptions {
   skipDefaultConfig: boolean
 }
 
-export type AssetBuilderConfig = {
-  nautilusDDO: NautilusDDO
-  aquariusAsset: Asset
-}
-
 export type ServiceBuilderConfig =
   | {
       serviceType: ServiceTypes

src/@types/Publish.ts

@@ -107,3 +107,8 @@ export interface PublishResponse {
   ddo: DDO
   setMetadataTxReceipt: providers.TransactionReceipt
 }
+
+export type TrustedAlgorithmAsset = {
+  did: string
+  serviceIds?: string[]
+}

src/Nautilus/Asset/AssetBuilder.ts

@@ -1,5 +1,5 @@
+import { Asset } from '@oceanprotocol/lib'
 import {
-  AssetBuilderConfig,
   CredentialListTypes,
   IAssetBuilder,
   LifecycleStates
@@ -12,21 +12,17 @@ import {
   NautilusService,
   ServiceTypes
 } from './Service/NautilusService'
+import { NautilusDDO } from './NautilusDDO'
 
 export class AssetBuilder implements IAssetBuilder {
   private asset: NautilusAsset
 
-  constructor(config?: AssetBuilderConfig) {
-    if (
-      (!config?.nautilusDDO && config?.aquariusAsset) ||
-      (config?.nautilusDDO && !config?.aquariusAsset)
-    ) {
-      throw new Error('Invalid AssetBuilder cunstructor parameter combination')
-    }
-    if (config?.nautilusDDO && config?.aquariusAsset) {
-      this.asset = new NautilusAsset(config.nautilusDDO)
-      this.asset.owner = config.aquariusAsset.nft.owner
-      this.asset.lifecycleState = config.aquariusAsset.nft.state
+  constructor(aquariusAsset?: Asset) {
+    if (aquariusAsset) {
+      const nautilusDDO = NautilusDDO.createFromAquariusAsset(aquariusAsset)
+      this.asset = new NautilusAsset(nautilusDDO)
+      this.asset.owner = aquariusAsset.nft.owner
+      this.asset.lifecycleState = aquariusAsset.nft.state
     } else {
       this.asset = new NautilusAsset()
     }

src/Nautilus/Asset/NautilusAsset.ts

@@ -1,9 +1,8 @@
-import { Nft, NftCreateData } from '@oceanprotocol/lib'
+import { NftCreateData } from '@oceanprotocol/lib'
 import { NftCreateDataWithoutOwner, PricingConfig } from '../../@types/Publish'
 import { NautilusDDO } from './NautilusDDO'
 import { nftInitialCreateData } from './constants/nft.constants'
 import { LifecycleStates } from '../../@types'
-import { Signer } from 'ethers'
 
 export type PricingConfigWithoutOwner = {
   type: PricingConfig['type']
@@ -29,24 +28,6 @@ export class NautilusAsset {
     this.initNftData()
   }
 
-  public static async setLifecycleState(
-    signer: Signer,
-    nftAddress: string,
-    publisherAccount: string,
-    state: LifecycleStates
-  ) {
-    const nft = new Nft(signer)
-
-    const stateTxReceipt = await nft.setMetadataState(
-      nftAddress,
-      publisherAccount,
-      state
-    )
-    const stateTx = await stateTxReceipt.wait()
-
-    return stateTx
-  }
-
   private initNftData() {
     this.nftCreateData = nftInitialCreateData
   }

src/Nautilus/Asset/NautilusDDO.ts

@@ -2,11 +2,10 @@ import {
   Asset,
   Credentials,
   DDO,
-  LoggerInstance,
   Service,
   generateDid
 } from '@oceanprotocol/lib'
-import { LifecycleStates, MetadataConfig } from '../../@types'
+import { MetadataConfig } from '../../@types'
 import {
   dateToStringNoMS,
   getAllPromisesOnArray,
@@ -18,8 +17,6 @@ import {
   NautilusService,
   ServiceTypes
 } from './Service/NautilusService'
-import { getAsset } from '../../utils/aquarius'
-import { Nautilus } from '../Nautilus'
 
 export class NautilusDDO {
   id: string
@@ -37,6 +34,12 @@ export class NautilusDDO {
     deny: []
   }
 
+  static createFromAquariusAsset(aquariusAsset: Asset): NautilusDDO {
+    const ddo = this.transformAquariusAssetToDDO(aquariusAsset)
+
+    return this.createFromDDO(ddo)
+  }
+
   static createFromDDO(ddo: DDO): NautilusDDO {
     const nautilusDDO = new NautilusDDO()
     nautilusDDO.ddo = ddo
@@ -55,26 +58,6 @@ export class NautilusDDO {
     return nautilusDDO
   }
 
-  static async createFromDID(
-    did: string,
-    nautilus: Nautilus
-  ): Promise<{ aquariusAsset: Asset; nautilusDDO: NautilusDDO }> {
-    const config = nautilus.getOceanConfig()
-
-    const asset = await getAsset(config.metadataCacheUri, did)
-    if (!asset)
-      throw new Error(
-        `No asset found for ${asset} in cache ${config.metadataCacheUri}`
-      )
-    if (asset.nft.state === LifecycleStates.REVOKED_BY_PUBLISHER)
-      LoggerInstance.warn('Unable to fetch asset: Revoked by publisher')
-
-    const ddo: DDO = asset as DDO // TODO remove data fields from Aquarius Asset which do not belong to DOO
-
-    const nautilusDDO = this.createFromDDO(ddo)
-    return { aquariusAsset: asset, nautilusDDO }
-  }
-
   getOriginalDDO() {
     return this.ddo
   }
@@ -114,11 +97,7 @@ export class NautilusDDO {
 
     // remove service from existing services if id changes to prevent old service after edit
     for (const service of this.services) {
-      const isFilesObjectChanged = !!(
-        (service.editExistingService && service.filesEdited) ||
-        (service.editExistingService && service.serviceEndpointEdited) ||
-        service.pricing
-      )
+      const isFilesObjectChanged = service.checkIfFilesObjectChanged()
 
       if (service.id && isFilesObjectChanged) {
         this.removeServices.push(service.id)
@@ -260,4 +239,20 @@ export class NautilusDDO {
     // Otherwise we return the replacement
     return replacementService
   }
+
+  static transformAquariusAssetToDDO(aquariusAsset: Asset): DDO {
+    const ddo = structuredClone(aquariusAsset)
+
+    const unwantedAssetAttributes = [
+      'nft',
+      'datatokens',
+      'event',
+      'stats',
+      'purgatory'
+    ]
+    for (const attribute of unwantedAssetAttributes) {
+      delete ddo[attribute]
+    }
+    return ddo as DDO
+  }
 }

src/Nautilus/Asset/Service/NautilusService.ts

@@ -1,6 +1,5 @@
 import {
   Arweave,
-  FixedRateExchange,
   GraphqlQuery,
   Ipfs,
   Service,
@@ -9,7 +8,10 @@ import {
   UrlFile,
   getHash
 } from '@oceanprotocol/lib'
-import { DatatokenCreateParamsWithoutOwner } from '../../../@types/Publish'
+import {
+  DatatokenCreateParamsWithoutOwner,
+  TrustedAlgorithmAsset
+} from '../../../@types/Publish'
 import {
   getEncryptedFiles,
   getFileInfo,
@@ -18,10 +20,6 @@ import {
 import { NautilusConsumerParameter } from '../ConsumerParameters'
 import { PricingConfigWithoutOwner } from '../NautilusAsset'
 import { params as DatatokenConstantParams } from '../constants/datatoken.constants'
-import { Nautilus } from '../../Nautilus'
-import { Signer } from 'ethers'
-import { getAsset } from '../../../utils/aquarius'
-import { getAccessDetails } from '../../../utils/helpers/access-details'
 
 export {
   Arweave,
@@ -85,6 +83,8 @@ export class NautilusService<
     publisherTrustedAlgorithms: []
   }
 
+  addedPublisherTrustedAlgorithms: TrustedAlgorithmAsset[] = []
+
   consumerParameters?: NautilusConsumerParameter[] = []
   additionalInformation?: { [key: string]: any }
 
@@ -101,40 +101,6 @@ export class NautilusService<
     this.datatokenCreateParams = DatatokenConstantParams
   }
 
-  public static async editPrice(
-    nautilus: Nautilus,
-    signer: Signer,
-    did: string,
-    serviceId: string,
-    newPrice: string
-  ) {
-    const config = nautilus.getOceanConfig()
-
-    const aquariusAsset = await getAsset(config.metadataCacheUri, did)
-
-    const service: Service = aquariusAsset.services.find(
-      (service) => service.id === serviceId
-    )
-
-    const fixedRateInstance = new FixedRateExchange(
-      config.fixedRateExchangeAddress,
-      signer
-    )
-
-    const accessDetails = await getAccessDetails(
-      config.subgraphUri,
-      service.datatokenAddress
-    )
-
-    const tx = await fixedRateInstance.setRate(
-      accessDetails.addressOrId,
-      newPrice
-    )
-    const txReceipt = await tx.wait()
-
-    return txReceipt
-  }
-
   async getOceanService(
     chainId: number,
     nftAddress: string,
@@ -149,11 +115,7 @@ export class NautilusService<
     const datatokenAddress = dtAddress || this.datatokenAddress
     if (!datatokenAddress) throw new Error('datatokenAddress is required')
 
-    const isFilesObjectChanged = !!(
-      (this.editExistingService && this.filesEdited) ||
-      (this.editExistingService && this.serviceEndpointEdited) ||
-      this.pricing
-    )
+    const isFilesObjectChanged = this.checkIfFilesObjectChanged()
 
     let encryptedFiles: string
 
@@ -216,4 +178,12 @@ export class NautilusService<
 
     return true
   }
+
+  checkIfFilesObjectChanged(): boolean {
+    return (
+      (this.editExistingService &&
+        (this.filesEdited || this.serviceEndpointEdited)) ||
+      !!this.pricing
+    )
+  }
 }

src/Nautilus/Asset/Service/ServiceBuilder.ts

@@ -1,4 +1,4 @@
-import { PublisherTrustedAlgorithm, Service, Asset } from '@oceanprotocol/lib'
+import { Service } from '@oceanprotocol/lib'
 import { IServiceBuilder, ServiceBuilderConfig } from '../../../@types/Nautilus'
 import {
   ConsumerParameterBuilder,
@@ -12,7 +12,8 @@ import {
 } from './NautilusService'
 import {
   ConsumerParameterSelectOption,
-  DatatokenCreateParamsWithoutOwner
+  DatatokenCreateParamsWithoutOwner,
+  TrustedAlgorithmAsset
 } from '../../../@types/Publish'
 import { PricingConfigWithoutOwner } from '../NautilusAsset'
 
@@ -172,39 +173,34 @@ export class ServiceBuilder<
     return this
   }
 
-  addTrustedAlgorithms(algorithms: PublisherTrustedAlgorithm[]) {
+  addTrustedAlgorithms(trustedAlgorithmAssets: TrustedAlgorithmAsset[]) {
     if (this.service.type !== 'compute') {
       throw new Error('Illegal operation, asset is not a compute asset!')
     }
 
-    // Check if the algorithms array is empty
-    if (algorithms.length === 0) {
-      throw new Error('No algorithms provided.')
+    if (!trustedAlgorithmAssets || trustedAlgorithmAssets.length === 0) {
+      throw new Error('No TrustedAlgorithmAssets provided.')
     }
 
-    // Initialize the publisherTrustedAlgorithms array if it doesn't exist
-    if (!this.service.compute.publisherTrustedAlgorithms) {
-      this.service.compute.publisherTrustedAlgorithms = []
-    }
-
-    algorithms.forEach((algorithm) => {
-      const index = this.service.compute.publisherTrustedAlgorithms.findIndex(
-        (existingAlgorithm) => existingAlgorithm.did === algorithm.did
-      )
-
-      if (index === -1) {
-        // Algorithm with the same DID doesn't exist, add it
-        this.service.compute.publisherTrustedAlgorithms.push(algorithm)
+    trustedAlgorithmAssets.forEach((trustedAlgorithmAsset) => {
+      const existingIndex =
+        this.service.addedPublisherTrustedAlgorithms.findIndex(
+          (existingAsset) => existingAsset.did === trustedAlgorithmAsset.did
+        )
+
+      if (existingIndex > -1) {
+        // Merge serviceIds
+        this.service.addedPublisherTrustedAlgorithms[existingIndex].serviceIds =
+          Array.from(
+            new Set([
+              ...(this.service.addedPublisherTrustedAlgorithms[existingIndex]
+                .serviceIds || []),
+              ...(trustedAlgorithmAsset.serviceIds || [])
+            ])
+          )
       } else {
-        // If either checksum is different, replace the existing algorithm
-        const existing = this.service.compute.publisherTrustedAlgorithms[index]
-        if (
-          existing.containerSectionChecksum !==
-            algorithm.containerSectionChecksum ||
-          existing.filesChecksum !== algorithm.filesChecksum
-        ) {
-          this.service.compute.publisherTrustedAlgorithms[index] = algorithm
-        }
+        // Add new trusted algorithm asset
+        this.service.addedPublisherTrustedAlgorithms.push(trustedAlgorithmAsset)
       }
     })
 
@@ -306,7 +302,7 @@ export class ServiceBuilder<
   setPricing(pricing: PricingConfigWithoutOwner) {
     if (this.service.editExistingService)
       throw new Error(
-        'Can not set new Pricing configs for existing assets. Use static editPrice() function.'
+        'Can not set new pricing configs for existing services using the builder. Use nautilus.setServicePrice() method instead.'
       )
     this.service.pricing = pricing