Merge pull request #137 from oceanprotocol/small-refactor

ocean-lib update + small refactor

example/src/AllDdos.tsx

@@ -15,13 +15,13 @@ export function AllDdos() {
     async function init() {
       if (!ocean || !accountId || !accountId) return
 
-      const assets = await ocean.assets.ownerAssets(accountId)
-      // const assets = await ocean.assets.query({
-      //   page: 1,
-      //   offset: 10,
-      //   query: {},
-      //   sort: { created: -1 }
-      // })
+      //const assets = await ocean.assets.ownerAssets(accountId)
+      const assets = await ocean.assets.query({
+        page: 1,
+        offset: 10,
+        query: {},
+        sort: { created: -1 }
+      })
       console.log('assets', assets.results)
       setDdos(assets.results.slice(0, 4))
     }

package.json

@@ -25,7 +25,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@oceanprotocol/lib": "^0.5.3",
+    "@oceanprotocol/lib": "^0.5.5",
     "axios": "^0.20.0",
     "decimal.js": "^10.2.1",
     "web3": "^1.3.0",

src/hooks/useCompute/useCompute.ts

@@ -1,10 +1,10 @@
 import { useState } from 'react'
-import { useOcean } from '../../providers'
+import { useOcean } from 'providers'
 import { ComputeValue } from './ComputeOptions'
 import { Logger } from '@oceanprotocol/lib'
 import { MetadataAlgorithm } from '@oceanprotocol/lib/dist/node/ddo/interfaces/MetadataAlgorithm'
 import { ComputeJob } from '@oceanprotocol/lib/dist/node/ocean/interfaces/ComputeJob'
-import { checkAndBuyDT } from '../../utils/dtUtils'
+import { checkAndBuyDT } from 'utils/dtUtils'
 
 interface UseCompute {
   compute: (

src/hooks/useConsume/useConsume.ts

@@ -1,8 +1,8 @@
 import { useState } from 'react'
-import { useOcean } from '../../providers'
-import { feedback } from '../../utils'
+import { useOcean } from 'providers'
+import { feedback } from 'utils'
 import { DID, Logger, ServiceType } from '@oceanprotocol/lib'
-import { checkAndBuyDT } from '../../utils/dtUtils'
+import { checkAndBuyDT } from 'utils/dtUtils'
 
 interface UseConsume {
   consume: (

src/hooks/useMetadata/useMetadata.ts

@@ -1,9 +1,9 @@
 import { useState, useEffect, useCallback } from 'react'
 import { DID, DDO, Metadata, Logger } from '@oceanprotocol/lib'
-import { useOcean } from '../../providers'
-import ProviderStatus from '../../providers/OceanProvider/ProviderStatus'
-import { getBestDataTokenPrice } from '../../utils/dtUtils'
-import { isDDO } from '../../utils'
+import { useOcean } from 'providers'
+import ProviderStatus from 'providers/OceanProvider/ProviderStatus'
+import { getBestDataTokenPrice } from 'utils/dtUtils'
+import { isDDO } from 'utils'
 import BestPrice from './BestPrice'
 
 interface UseMetadata {

src/hooks/usePublish/usePublish.ts

@@ -6,9 +6,9 @@ import {
 } from '@oceanprotocol/lib/dist/node/ddo/interfaces/Service'
 import { useState } from 'react'
 import { DataTokenOptions } from '.'
-import { useOcean } from '../../providers'
-import ProviderStatus from '../../providers/OceanProvider/ProviderStatus'
-import { publishFeedback } from '../../utils'
+import { useOcean } from 'providers'
+import ProviderStatus from 'providers/OceanProvider/ProviderStatus'
+import { publishFeedback } from 'utils'
 import { PriceOptions } from './PriceOptions'
 
 interface UsePublish {

src/providers/OceanProvider/OceanProvider.tsx

@@ -12,7 +12,7 @@ import ProviderStatus from './ProviderStatus'
 import { Ocean, Logger, Account, Config } from '@oceanprotocol/lib'
 import Web3Modal, { ICoreOptions } from 'web3modal'
 import { getDefaultProviders } from './getDefaultProviders'
-import { getAccountId, getBalance } from '../../utils'
+import { getAccountId, getBalance } from 'utils'
 
 interface Balance {
   eth: string | undefined

src/utils/dtUtils.ts

@@ -1,7 +1,7 @@
 import { Logger, Ocean, Account, Config } from '@oceanprotocol/lib'
 import { Decimal } from 'decimal.js'
-import Pool from '../hooks/useMetadata/Pool'
-import BestPrice from '../hooks/useMetadata/BestPrice'
+import Pool from 'hooks/useMetadata/Pool'
+import BestPrice from 'hooks/useMetadata/BestPrice'
 import Web3 from 'web3'
 
 export async function getCheapestPool(

src/utils/web3.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3'
 import { Account } from '@oceanprotocol/lib'
-import { Balance } from '../providers'
+import { Balance } from 'providers'
 
 export async function getAccountId(web3: Web3): Promise<string> {
   const accounts = await web3.eth.getAccounts()

tsconfig.json

@@ -8,6 +8,7 @@
     "jsx": "react",
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
+    "baseUrl": "src",
     "sourceMap": true,
     "declaration": true,
     "importHelpers": true,