C2D V2 fixes

metadata/jsAlgo.json

@@ -37,9 +37,11 @@
         "nftAddress": "0x0",
         "files": [
           {
+            "type": "url",
             "url": "https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js",
             "contentType": "text/js",
-            "encoding": "UTF-8"
+            "encoding": "UTF-8",
+            "method": "GET"
           }
         ]
       },

metadata/simpleComputeDataset.json

@@ -5,7 +5,7 @@
   "id": "",
   "nftAddress": "",
   "version": "4.1.0",
-  "chainId": 8996,
+  "chainId": null,
   "metadata": {
     "created": "2021-12-20T14:35:20Z",
     "updated": "2021-12-20T14:35:20Z",

package.json

@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@oceanprotocol/contracts": "^2.0.4",
-    "@oceanprotocol/lib": "^3.4.1",
+    "@oceanprotocol/lib": "^4.0.0-next.1",
     "cross-fetch": "^3.1.5",
     "crypto-js": "^4.1.1",
     "decimal.js": "^10.4.1",

src/commands.ts

@@ -334,8 +334,9 @@ export class Commands {
 			}
 			assets.push({
 				documentId: ddos[dataDdo].id,
-				serviceId: ddos[dataDdo].services[0].id,
+				serviceId: ddos[dataDdo].services[0].id
 			});
+
 		}
 
 		console.log("Starting compute job using provider: ", providerURI);
@@ -346,7 +347,7 @@ export class Commands {
 				computeEnv.id,
 				computeValidUntil,
 				providerURI,
-				await this.signer.getAddress()
+				this.signer // V1 was this.signer.getAddress()
 			);
 		if (
 			!providerInitializeComputeJob ||
@@ -411,6 +412,10 @@ export class Commands {
 				" with additional datasets:" +
 				(!additionalDatasets ? "none" : additionalDatasets[0].documentId)
 		);
+		if(additionalDatasets!==null) {
+			console.log('Adding additional datasets to dataset, according to C2D V2 specs')
+			assets.push(additionalDatasets)
+		}
 
 		const output: ComputeOutput =  {
 			metadataUri: await getMetadataURI()
@@ -420,12 +425,14 @@ export class Commands {
 			providerURI,
 			this.signer,
 			computeEnv.id,
-			assets[0],
+			assets, // assets[0] // only c2d v1,
 			algo,
 			null,
-			additionalDatasets,
-			output
+			// additionalDatasets, only c2d v1
+			output,
+			computeEnv.free ? true : false //
 		);
+
 		if (computeJobs && computeJobs[0]) {
 			const { jobId, agreementId } = computeJobs[0];
 			console.log("Compute started.  JobID: " + jobId);

src/helpers.ts

@@ -29,7 +29,7 @@
 	ProviderFees,
 	ComputeAlgorithm,
 	LoggerInstance,
-	Datatoken4 
+	Datatoken4
 } from "@oceanprotocol/lib";
 import { hexlify } from "ethers/lib/utils";
 
@@ -71,8 +71,8 @@
 	name: string,
 	symbol: string,
 	owner: Signer,
 	assetUrl: any,
 	ddo: any,
 	providerUrl: string,
 	config: Config,
 	aquariusInstance: Aquarius,
@@ -130,14 +130,14 @@
 			datatokenParams
 		);
 	} else if (ddo?.stats?.price?.value === "0") {
+
 		const dispenserParams: DispenserCreationParams = {
 			dispenserAddress: config.dispenserAddress,
 			maxTokens: "1",
 			maxBalance: "100000000",
 			withMint: true,
 			allowedSwapper: ZERO_ADDRESS,
 		};
-
 		bundleNFT = await nftFactory.createNftWithDatatokenWithDispenser(
 			nftParamsAsset,
 			datatokenParams,
@@ -174,6 +174,9 @@
 	// create the files encrypted string
 	assetUrl.datatokenAddress = datatokenAddressAsset;
 	assetUrl.nftAddress = nftAddress;
+	if(!assetUrl.type) {
+		assetUrl.type = 'url'
+	}
 	ddo.services[0].files = templateIndex === 4 ? '' : await ProviderInstance.encrypt(
 		assetUrl,
 		chainId,
@@ -299,7 +302,10 @@
        - have validOrder and providerFees -> then order is valid but providerFees are not valid, we need to call reuseOrder and pay only providerFees
        - no validOrder -> we need to call startOrder, to pay 1 DT & providerFees
     */
-	if (order.providerFee && order.providerFee.providerFeeAmount) {
+   const hasProviderFees = order.providerFee && order.providerFee.providerFeeAmount
+   // no need to approve if it is 0
+	if (hasProviderFees && Number(order.providerFee.providerFeeAmount) > 0) {
+
 		await approveWei(
 			payerAccount,
 			config,
@@ -308,6 +314,7 @@
 			asset.services[0].datatokenAddress,
 			order.providerFee.providerFeeAmount
 		);
+
 	}
 	if (order.validOrder) {
 		if (!order.providerFee) return order.validOrder;

src/publishAsset.ts

@@ -3,7 +3,7 @@ import { Signer } from 'ethers';
 import {
   Config,
   Aquarius,
-  DDO
+  Asset
 } from '@oceanprotocol/lib';
 import { createAsset, updateAssetMetadata } from './helpers';
 
@@ -28,7 +28,7 @@ export async function publishAsset(params: PublishAssetParams, signer: Signer, c
     const aquarius = new Aquarius(config.metadataCacheUri);
 
     // Prepare initial metadata for the asset
-    const metadata: DDO = {
+    const metadata: Asset = {
       '@context': ['https://w3id.org/did/v1'],
       id: '', // Will be updated after creating asset
       version: '4.1.0',
@@ -48,7 +48,7 @@ export async function publishAsset(params: PublishAssetParams, signer: Signer, c
         allocated: 0,
         orders: 0,
         price: {
-          value: params.isCharged ? params.price : "0"
+          value: params.isCharged ? Number(params.price) : 0
         }
       },
       services: [
@@ -70,7 +70,10 @@ export async function publishAsset(params: PublishAssetParams, signer: Signer, c
         tokenURI: "",
         owner: "",
         created: ""
-      }
+      },
+      datatokens: [],
+      event: undefined,
+      purgatory: undefined
     };
 
     // Asset URL setup based on storage type