Skip to content

Commit

Permalink
Merge pull request #382 from oceanprotocol/feature/dataTokenInfo
Browse files Browse the repository at this point in the history
add datatokeninfo to ddo creation
  • Loading branch information
kremalicious authored Oct 20, 2020
2 parents d685cb1 + 9dc1b81 commit c300e70
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/ddo/interfaces/DataTokenInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ export interface DataTokenInfo {
name: string
symbol: string
blob: string
decimals: number
totalSupply: number
cap: number
minter: string
minterBalance: number
decimals?: number
totalSupply?: number
cap?: number
minter?: string
minterBalance?: number
}
11 changes: 9 additions & 2 deletions src/ocean/Assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import BigNumber from 'bignumber.js'
import { Provider } from '../provider/Provider'
import { isAddress } from 'web3-utils'
import { MetadataMain } from '../ddo/interfaces'
import { DataTokens } from '../lib'

export enum CreateProgressStep {
CreatingDataToken,
Expand Down Expand Up @@ -86,13 +87,12 @@ export class Assets extends Instantiable {
if (services.length === 0) {
this.logger.log('You have no services. Are you sure about this?')
}

const { datatokens } = this.ocean
if (!dtAddress) {
this.logger.log('Creating datatoken')
observer.next(CreateProgressStep.CreatingDataToken)
const metadataCacheUri = this.ocean.metadatacache.getURI()
const jsonBlob = { t: 1, url: metadataCacheUri }
const { datatokens } = this.ocean

dtAddress = await datatokens.create(
JSON.stringify(jsonBlob),
Expand Down Expand Up @@ -187,6 +187,13 @@ export class Assets extends Instantiable {
})) as Service[]
})
await ddo.addProof(this.ocean, publisher.getId())
ddo.dataTokenInfo = {
name: await datatokens.getName(dtAddress),
symbol: await datatokens.getSymbol(dtAddress),
address: dtAddress,
blob: await datatokens.getBlob(dtAddress),
cap: parseFloat(await datatokens.getCap(dtAddress))
}
this.logger.log('Storing DDO')
observer.next(CreateProgressStep.StoringDdo)
// const storedDdo = await this.ocean.metadatacache.storeDDO(ddo)
Expand Down

0 comments on commit c300e70

Please sign in to comment.