Merge pull request #23 from oceanprotocol/feature/cleanOceanVersions

Fix versions module

package.json

@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@ethereum-navigator/navigator": "^0.5.0",
-    "@oceanprotocol/keeper-contracts": "^0.13.2",
+    "@oceanprotocol/ocean-contracts": "^0.0.1",
     "@oceanprotocol/secret-store-client": "^0.0.15",
     "bignumber.js": "^9.0.0",
     "deprecated-decorator": "^0.1.6",

src/lib.ts

@@ -20,6 +20,6 @@ export {
     OceanPlatformTech,
     OceanPlatformKeeperTech,
     OceanPlatformVersions
-} from './ocean/OceanVersions'
+} from './ocean/Versions'
 
 export { Ocean, Account, Config, DID, Logger, Aquarius, DataTokens, utils }

src/ocean/Ocean.ts

@@ -5,7 +5,7 @@ import { OceanAuth } from './OceanAuth'
 import { Compute } from './Compute'
 
 import { OceanTokens } from './OceanTokens'
-import { OceanVersions } from './OceanVersions'
+import { OceanVersions } from './Versions'
 import { OceanUtils } from './utils/OceanUtils'
 
 import { Aquarius } from '../aquarius/Aquarius'

src/ocean/Versions.ts

@@ -1,4 +1,4 @@
-import * as keeperPackageJson from '@oceanprotocol/keeper-contracts/package.json'
+import * as OceanPackageJson from '@oceanprotocol/ocean-contracts/package.json'
 import * as metadata from '../metadata.json'
 
 import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
@@ -17,16 +17,16 @@ export interface OceanPlatformTech {
     status: OceanPlatformTechStatus
 }
 
-export interface OceanPlatformKeeperTech extends OceanPlatformTech {
+export interface OceanPlatformContractsTech extends OceanPlatformTech {
     network?: string
-    keeperVersion?: string
+    ContractsVersion?: string
     contracts?: { [contractName: string]: string }
 }
 
 export interface OceanPlatformVersions {
-    squid: OceanPlatformKeeperTech
+    lib: OceanPlatformContractsTech
-    aquarius: OceanPlatformTech
+    metadataStore: OceanPlatformTech
-    brizo: OceanPlatformKeeperTech
+    provider: OceanPlatformContractsTech
     status: {
         ok: boolean
         contracts: boolean
@@ -37,81 +37,72 @@ export interface OceanPlatformVersions {
 /**
  * Versions submodule of Ocean Protocol.
  */
-export class OceanVersions extends Instantiable {
+export class Versions extends Instantiable {
     /**
-     * Returns the instance of OceanVersions.
+     * Returns the instance of Ocean Stack Versions.
-     * @return {Promise<OceanVersions>}
+     * @return {Promise<Versions>}
      */
-    public static async getInstance(config: InstantiableConfig): Promise<OceanVersions> {
+    public static async getInstance(config: InstantiableConfig): Promise<Versions> {
-        const instance = new OceanVersions()
+        const instance = new Versions()
         instance.setInstanceConfig(config)
-
         return instance
     }
 
     public async get(): Promise<OceanPlatformVersions> {
         const versions = {} as OceanPlatformVersions
 
-        // Squid
+        versions.lib = {
-        versions.squid = {
+            name: 'Ocean-lib-js',
-            name: 'Squid-js',
             version: metadata.version,
             commit: metadata.commit,
             status: OceanPlatformTechStatus.Working,
-            network: (await this.ocean.keeper.getNetworkName()).toLowerCase(),
+            network:(await this.ocean.network.getNetworkName()).toLowerCase(),
-            keeperVersion: keeperPackageJson.version,
+            ContractsVersion: OceanPackageJson.version,
-            contracts: Object.values(await this.ocean.keeper.getAllInstances())
+            contracts: {}
-                .filter(_ => !!_)
-                .reduce(
-                    (acc, { contractName, address }) => ({
-                        ...acc,
-                        [contractName]: address
-                    }),
-                    {}
-                )
         }
 
-        // Brizo
+        // Provider
         try {
             const {
                 contracts,
-                'keeper-version': keeperVersion,
+                contractsVersion,
                 network,
                 software: name,
                 version
-            } = await this.ocean.brizo.getVersionInfo()
+            } = await this.ocean.provider.getVersionInfo()
-            versions.brizo = {
+
+            versions.provider = {
                 name,
                 status: OceanPlatformTechStatus.Working,
                 version,
                 contracts,
                 network,
-                keeperVersion: keeperVersion.replace(/^v/, '')
+                ContractsVersion: contractsVersion
             }
         } catch {
-            versions.brizo = {
+            versions.provider = {
-                name: 'Brizo',
+                name: 'Provider',
                 status: OceanPlatformTechStatus.Stopped
             }
         }
 
-        // Aquarius
+        // MetadataStore
         try {
-            const { software: name, version } = await this.ocean.aquarius.getVersionInfo()
+            const { software: name, version } = await this.ocean.metadataStore.getVersionInfo()
-            versions.aquarius = {
+            versions.metadataStore = {
                 name,
                 status: OceanPlatformTechStatus.Working,
                 version
             }
         } catch {
-            versions.aquarius = {
+            versions.metadataStore = {
-                name: 'Aquarius',
+                name: 'MetadataStore',
                 status: OceanPlatformTechStatus.Stopped
             }
         }
 
         // Status
-        const techs: OceanPlatformKeeperTech[] = Object.values(versions as any)
+        const techs: OceanPlatformContractsTech[] = Object.values(versions as any)
 
         const networks = techs
             .map(({ network }) => network)