remove any

Author: giurgiur99

src/commands.ts

@@ -155,7 +155,7 @@ export class Commands {
 
 		const updateAssetTx = await updateAssetMetadata(
 			this.signer,
-			asset as any,
+			asset,
 			this.oceanNodeUrl,
 			this.aquarius,
 			encryptDDO
@@ -354,7 +354,7 @@ export class Commands {
 				ddos[dataDdo],
 				ddos[dataDdo].services[0].id,
 				algo,
-				algoDdo as any
+				algoDdo
 			);
 			if (!canStartCompute) {
 				console.error(
@@ -396,7 +396,7 @@ export class Commands {
 		console.log("Ordering algorithm: ", args[2]);
 		algo.transferTxId = await handleComputeOrder(
 			providerInitializeComputeJob.algorithm,
-			algoDdo as any,
+			algoDdo,
 			this.signer,
 			computeEnv.consumerAddress,
 			0,
@@ -601,7 +601,7 @@ export class Commands {
 				ddos[dataDdo],
 				ddos[dataDdo].services[0].id,
 				algo,
-				algoDdo as any
+				algoDdo
 			);
 			if (!canStartCompute) {
 				console.error(
@@ -751,8 +751,7 @@ export class Commands {
 			return;
 		}
 
-		// @ts-ignore
-		if (asset.nft.owner !== (await this.signer.getAddress())) {
+		if (asset.indexedMetadata.nft.owner !== (await this.signer.getAddress())) {
 			console.error(
 				"You are not the owner of this asset, and there for you cannot update it."
 			);
@@ -806,7 +805,7 @@ export class Commands {
 		try {
 			const txid = await updateAssetMetadata(
 				this.signer,
-				asset as any,
+				asset,
 				this.oceanNodeUrl,
 				this.aquarius,
 				encryptDDO
@@ -832,8 +831,7 @@ export class Commands {
 			);
 			return;
 		}
-		// @ts-ignore
-		if (asset.nft.owner !== (await this.signer.getAddress())) {
+		if (asset.indexedMetadata.nft.owner !== (await this.signer.getAddress())) {
 			console.error(
 				"You are not the owner of this asset, and there for you cannot update it."
 			);
@@ -876,7 +874,7 @@ export class Commands {
 
 		const txid = await updateAssetMetadata(
 			this.signer,
-			asset as any,
+			asset,
 			this.oceanNodeUrl,
 			this.aquarius,
 			encryptDDO

src/helpers.ts

@@ -109,7 +109,7 @@ export async function createAssetUtil(
 	symbol: string,
 	owner: Signer,
 	assetUrl: any,
-	ddo: any,
+	ddo: DDO,
 	oceanNodeUrl: string,
 	config: Config,
 	aquariusInstance: Aquarius,
@@ -159,10 +159,10 @@ export async function updateAssetMetadata(
 	const nft = new Nft(owner, (await owner.provider.getNetwork()).chainId);
 	let flags;
 	let metadata;
-	const validateResult = await aquariusInstance.validate(updatedDdo as any, owner, oceanNodeUrl);
+	const validateResult = await aquariusInstance.validate(updatedDdo, owner, oceanNodeUrl);
 	if (encryptDDO) {
 		const providerResponse = await ProviderInstance.encrypt(
-			updatedDdo as any,
+			updatedDdo,
 			updatedDdo.chainId,
 			oceanNodeUrl
 		);
@@ -233,7 +233,7 @@ export async function handleComputeOrder(
 	}
 	console.log("Ordering asset with DID: ", asset.id);
 	const txStartOrder = await orderAsset(
-		asset as any,
+		asset,
 		payerAccount,
 		config,
 		datatoken,

src/publishAsset.ts

@@ -5,6 +5,7 @@ import {
   Aquarius,
 } from '@oceanprotocol/lib';
 import { createAssetUtil, updateAssetMetadata } from './helpers.js';
+import { Asset } from '@oceanprotocol/ddo-js';
 
 export interface PublishAssetParams {
   title: string;
@@ -26,7 +27,7 @@ export async function publishAsset(aquarius: Aquarius, params: PublishAssetParam
   try {
 
     // Prepare initial metadata for the asset
-    const metadata = {
+    const metadata: Asset = {
       '@context': ['https://w3id.org/did/v1'],
       id: '', // Will be updated after creating asset
       version: '4.1.0',
@@ -42,12 +43,33 @@ export async function publishAsset(aquarius: Aquarius, params: PublishAssetParam
         license: 'MIT',
         tags: params.tags
       },
-      stats: {
-        allocated: 0,
-        orders: 0,
-        price: {
-          value: params.isCharged ? Number(params.price) : 0
-        }
+      indexedMetadata: {
+        nft: {
+          address: "",
+          name: "Ocean Data NFT",
+          symbol: "OCEAN-NFT",
+          state: 5,
+          tokenURI: "",
+          owner: "",
+          created: ""
+        },
+        event: undefined,
+        purgatory: undefined,
+        stats: [
+          {
+            orders: 0,
+            prices: [{
+              price: params.price,
+              contract: '0x282d8efCe846A88B159800bd4130ad77443Fa1A1',
+              token: params.token,
+              type: params.isCharged === false ? 'dispenser' : 'fixedrate'
+            }],
+            datatokenAddress: '',
+            name: 'access',
+            serviceId: 'access',
+            symbol: ''
+          }
+        ]
       },
       services: [
         {
@@ -59,20 +81,9 @@ export async function publishAsset(aquarius: Aquarius, params: PublishAssetParam
           serviceEndpoint: params.providerUrl,
           timeout: Number(params.timeout),
         },
-      ],
-      nft: {
-        address: "",
-        name: "Ocean Data NFT",
-        symbol: "OCEAN-NFT",
-        state: 5,
-        tokenURI: "",
-        owner: "",
-        created: ""
-      },
-      datatokens: [],
-      event: undefined,
-      purgatory: undefined
-    } as any;
+      ]
+    };
+
 
     // Asset URL setup based on storage type
     const assetUrl = {