Merge pull request #147 from oceanprotocol/feature/next-ocean-js

use latest ocean.js

Author: alexcos20

package-lock.json

@@ -47,7 +47,7 @@
     "@oasisprotocol/sapphire-paratime": "^1.3.2",
     "@oceanprotocol/contracts": "^2.5.0",
     "@oceanprotocol/ddo-js": "^0.1.4",
-    "@oceanprotocol/lib": "^6.0.0",
+    "@oceanprotocol/lib": "^6.1.0",
     "commander": "^13.1.0",
     "cross-fetch": "^3.1.5",
     "crypto-js": "^4.1.1",

package.json

@@ -6,7 +6,6 @@ import {
   updateAssetMetadata,
   downloadFile,
   isOrderable,
-  getMetadataURI,
   getIndexingWaitSettings,
   IndexerWaitParams,
   fixAndParseProviderFees,
@@ -16,7 +15,6 @@ import {
   Aquarius,
   ComputeAlgorithm,
   ComputeJob,
-  ComputeOutput,
   Config,
   ConfigHelper,
   Datatoken,
@@ -31,7 +29,6 @@ import {
   AccesslistFactory,
   AccessListContract,
 } from "@oceanprotocol/lib";
-import { Asset } from "@oceanprotocol/ddo-js";
 import { Signer, ethers, getAddress } from "ethers";
 import { interactiveFlow } from "./interactiveFlow.js";
 import { publishAsset } from "./publishAsset.js";
@@ -86,7 +83,7 @@ export class Commands {
         asset.indexedMetadata.nft.name,
         asset.indexedMetadata.nft.symbol,
         this.signer,
-        asset.services[0].files,
+        asset.services[0].files.files,
         asset,
         this.oceanNodeUrl,
         this.config,
@@ -102,7 +99,7 @@ export class Commands {
   }
 
   public async publishAlgo(args: string[]) {
-    let algoAsset: Asset;
+    let algoAsset;
     try {
       algoAsset = JSON.parse(fs.readFileSync(args[1], "utf8"));
     } catch (e) {
@@ -117,7 +114,7 @@ export class Commands {
         algoAsset.indexedMetadata.nft.name,
         algoAsset.indexedMetadata.nft.symbol,
         this.signer,
-        algoAsset.services[0].files,
+        algoAsset.services[0].files.files,
         algoAsset,
         this.oceanNodeUrl,
         this.config,

src/commands.ts

@@ -53,8 +53,7 @@ describe("Ocean CLI Publishing", function() {
         process.env.ADDRESS_FILE = path.join(process.env.HOME || "", ".ocean/ocean-contracts/artifacts/address.json");
 
         const output = await runCommand(`npm run cli publish ${metadataFile}`);
-
-		const jsonMatch = output.match(/did:op:[a-f0-9]{64}/);
+        const jsonMatch = output.match(/did:op:[a-f0-9]{64}/);
         if (!jsonMatch) {
 			console.error("Raw output:", output);
 			throw new Error("Could not find did in the output");