From aa584316293906625ecc67db4a3d9194d15b31e0 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 8 Oct 2020 11:45:07 +0200 Subject: [PATCH 1/2] update DDO --- src/ddo/DDO.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts index 67740a1a0..437ab14a5 100644 --- a/src/ddo/DDO.ts +++ b/src/ddo/DDO.ts @@ -51,6 +51,12 @@ export class DDO { public proof: Proof + public dtBalance: number + + public OceanBalance: number + + public dtPrice: number + public constructor(ddo: Partial = {}) { Object.assign(this, ddo, { created: (ddo && ddo.created) || new Date().toISOString().replace(/\.[0-9]{3}/, '') From d3b47d618ba145db55f12ba2a7ffdfc247d58693 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 8 Oct 2020 12:11:21 +0200 Subject: [PATCH 2/2] BestPrice interface --- src/ddo/DDO.ts | 7 ++----- src/ddo/interfaces/BestPrice.ts | 7 +++++++ src/ddo/interfaces/index.ts | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 src/ddo/interfaces/BestPrice.ts diff --git a/src/ddo/DDO.ts b/src/ddo/DDO.ts index 437ab14a5..04dfc516b 100644 --- a/src/ddo/DDO.ts +++ b/src/ddo/DDO.ts @@ -4,6 +4,7 @@ import { Proof } from './interfaces/Proof' import { PublicKey } from './interfaces/PublicKey' import { Service, ServiceType } from './interfaces/Service' import Web3Provider from '../datatokens/Web3Provider' +import { BestPrice } from './interfaces/BestPrice' /** * DID Descriptor Object. * Contains all the data related to an asset. @@ -51,11 +52,7 @@ export class DDO { public proof: Proof - public dtBalance: number - - public OceanBalance: number - - public dtPrice: number + public price: BestPrice public constructor(ddo: Partial = {}) { Object.assign(this, ddo, { diff --git a/src/ddo/interfaces/BestPrice.ts b/src/ddo/interfaces/BestPrice.ts new file mode 100644 index 000000000..b5433e80d --- /dev/null +++ b/src/ddo/interfaces/BestPrice.ts @@ -0,0 +1,7 @@ +export interface BestPrice { + type: 'pool' | 'exchange' + address: string + value: number + ocean?: number + datatoken?: number +} diff --git a/src/ddo/interfaces/index.ts b/src/ddo/interfaces/index.ts index dc85b0a88..ecfe4420c 100644 --- a/src/ddo/interfaces/index.ts +++ b/src/ddo/interfaces/index.ts @@ -1,5 +1,6 @@ export * from './AdditionalInformation' export * from './Authentication' +export * from './BestPrice' export * from './Curation' export * from './EditableMetadata' export * from './EditableMetadataLinks'