From 0ce31d79f2c8bc1f705137f9841e7ad9bc9363fa Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Tue, 26 May 2020 12:54:32 +0200 Subject: [PATCH 1/2] fix versions --- package.json | 2 +- src/ocean/OceanVersions.ts | 69 +++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index b8e36dde..d5c331b6 100644 --- a/package.json +++ b/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", diff --git a/src/ocean/OceanVersions.ts b/src/ocean/OceanVersions.ts index 9c1f048d..30a430ff 100644 --- a/src/ocean/OceanVersions.ts +++ b/src/ocean/OceanVersions.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 - aquarius: OceanPlatformTech - brizo: OceanPlatformKeeperTech + lib: OceanPlatformContractsTech + metadataStore: OceanPlatformTech + 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. - * @return {Promise} + * Returns the instance of Ocean Stack Versions. + * @return {Promise} */ - public static async getInstance(config: InstantiableConfig): Promise { - const instance = new OceanVersions() + public static async getInstance(config: InstantiableConfig): Promise { + const instance = new Versions() instance.setInstanceConfig(config) - return instance } public async get(): Promise { const versions = {} as OceanPlatformVersions - // Squid - versions.squid = { - name: 'Squid-js', + versions.lib = { + name: 'Ocean-lib-js', version: metadata.version, commit: metadata.commit, status: OceanPlatformTechStatus.Working, - network: (await this.ocean.keeper.getNetworkName()).toLowerCase(), - keeperVersion: keeperPackageJson.version, - contracts: Object.values(await this.ocean.keeper.getAllInstances()) - .filter(_ => !!_) - .reduce( - (acc, { contractName, address }) => ({ - ...acc, - [contractName]: address - }), - {} - ) + network:(await this.ocean.network.getNetworkName()).toLowerCase(), + ContractsVersion: OceanPackageJson.version, + contracts: {} } - // Brizo + // Provider try { const { contracts, - 'keeper-version': keeperVersion, + contractsVersion, network, software: name, version - } = await this.ocean.brizo.getVersionInfo() - versions.brizo = { + } = await this.ocean.provider.getVersionInfo() + + versions.provider = { name, status: OceanPlatformTechStatus.Working, version, contracts, network, - keeperVersion: keeperVersion.replace(/^v/, '') + ContractsVersion: contractsVersion } } catch { - versions.brizo = { - name: 'Brizo', + versions.provider = { + name: 'Provider', status: OceanPlatformTechStatus.Stopped } } - // Aquarius + // MetadataStore try { - const { software: name, version } = await this.ocean.aquarius.getVersionInfo() - versions.aquarius = { + const { software: name, version } = await this.ocean.metadataStore.getVersionInfo() + versions.metadataStore = { name, status: OceanPlatformTechStatus.Working, version } } catch { - versions.aquarius = { - name: 'Aquarius', + versions.metadataStore = { + 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) From 1235d48461c6e4e206df86dc4039dd99d43ee772 Mon Sep 17 00:00:00 2001 From: Ahmed Ali Date: Tue, 26 May 2020 13:33:56 +0200 Subject: [PATCH 2/2] update imports --- src/lib.ts | 2 +- src/ocean/Ocean.ts | 2 +- src/ocean/{OceanVersions.ts => Versions.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/ocean/{OceanVersions.ts => Versions.ts} (100%) diff --git a/src/lib.ts b/src/lib.ts index 629396ae..9241093d 100644 --- a/src/lib.ts +++ b/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 } diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts index 9124a27d..162a1cab 100644 --- a/src/ocean/Ocean.ts +++ b/src/ocean/Ocean.ts @@ -5,7 +5,7 @@ import { OceanAuth } from './OceanAuth' import { OceanCompute } from './OceanCompute' import { OceanTokens } from './OceanTokens' -import { OceanVersions } from './OceanVersions' +import { OceanVersions } from './Versions' import { OceanUtils } from './utils/OceanUtils' import { Aquarius } from '../aquarius/Aquarius' diff --git a/src/ocean/OceanVersions.ts b/src/ocean/Versions.ts similarity index 100% rename from src/ocean/OceanVersions.ts rename to src/ocean/Versions.ts