Merge pull request #129 from oceanprotocol/lib-update

Lib update

example/config-overrides.js

@@ -7,7 +7,8 @@ module.exports = function override(config, env) {
       ...config.resolve,
       alias: {
         ...config.resolve.alias,
-        react: path.resolve('../node_modules/react')
+        react: path.resolve('../node_modules/react'),
+        '@oceanprotocol/lib': path.resolve('../node_modules/@oceanprotocol/lib')
       }
     }
   }

example/src/AllDdos.tsx

@@ -7,25 +7,20 @@ import shortid from 'shortid'
 import { MetadataExample } from './MetadataExample'
 
 export function AllDdos() {
-  const { chainId, account, ocean } = useOcean()
+  const { chainId, account, accountId, ocean } = useOcean()
 
   const [ddos, setDdos] = useState<DDO[] | undefined>()
 
   useEffect(() => {
     async function init() {
-      if (!ocean || !account) return
+      if (!ocean || !account || !accountId) return
 
-      const assets = await ocean.assets.query({
-        page: 1,
-        offset: 10,
-        query: {},
-        sort: { created: -1 }
-      })
+      const assets = await ocean.assets.ownerAssets(accountId)
 
       setDdos(assets.results.slice(0, 4))
     }
     init()
-  }, [ocean, account, chainId])
+  }, [ocean, account, chainId, accountId])
 
   return (
     <>

example/src/App.tsx

@@ -3,13 +3,13 @@ import './App.css'
 import { OceanProvider } from '@oceanprotocol/react'
 import { Wallet } from './Wallet'
 import { Publish } from './Publish'
-import { ConfigHelper } from '@oceanprotocol/lib'
+import { ConfigHelper, Logger } from '@oceanprotocol/lib'
 import { AllDdos } from './AllDdos'
 import { ConsumeDdo } from './ConsumeDdo'
 import { NetworkMonitor } from './NetworkMonitor'
+import { LogLevel } from '@oceanprotocol/lib/dist/node/utils'
 
 const configRinkeby = new ConfigHelper().getConfig('rinkeby')
-
 const providerOptions = {}
 
 export const web3ModalOpts = {
@@ -19,6 +19,7 @@ export const web3ModalOpts = {
 
 function App() {
   console.log(configRinkeby)
+  Logger.setLevel(LogLevel.Verbose)
   const init = async () => {}
 
   useEffect(() => {

example/src/Publish.tsx

@@ -7,12 +7,12 @@ import { Metadata } from '@oceanprotocol/lib/dist/node/ddo/interfaces/Metadata'
 
 export function Publish() {
   const { publish, publishStepText, isLoading } = usePublish()
-  const [ddo, setDdo] = useState<DDO | undefined>()
+  const [ddo, setDdo] = useState<DDO | undefined | null>()
 
   const asset = {
     main: {
       type: 'dataset',
-      name: 'test-dataset',
+      name: 'test-dataset - ' + new Date().toISOString(),
       dateCreated: new Date(Date.now()).toISOString().split('.')[0] + 'Z', // remove milliseconds
       author: 'oceanprotocol-team',
       license: 'MIT',

package-lock.json

@@ -1516,19 +1516,20 @@
       }
     },
     "@oceanprotocol/contracts": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.4.1.tgz",
-      "integrity": "sha512-gc6bCt3pq9cpk1mYDKfsZhLlaM+8yQDFmOjtmT1KGXRmnTBcvmwCQXMrL5VohFaFi7Iqio3FZtuhYyRaEjikCw=="
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-0.4.4.tgz",
+      "integrity": "sha512-0+Tp6UdoDTBJZp4yX3kkSrV+CcOS/hJ3SJ4HuWiL5FE5Nlj3JCeV86iuWPkFuXzIdgri00DaGvQhP58knzJ2Uw=="
     },
     "@oceanprotocol/lib": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.2.5.tgz",
-      "integrity": "sha512-zd4xtawMftqJzak+EnAcHOorNL556w2L4DiOipP2tgVsBQmHgkPCWr65EL9dVuETFtGtatOb1RfdkyZPM0P2lA==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.3.2.tgz",
+      "integrity": "sha512-pdgY+PqDlLt64C/ZzxzZtUwN+f+pBTyBzSgXeS0j1D79BChnCtyZAeAR4JyMB/bJSarsWNv1oVUxxVPx9SJ5hw==",
       "requires": {
         "@ethereum-navigator/navigator": "^0.5.0",
-        "@oceanprotocol/contracts": "^0.4.1",
+        "@oceanprotocol/contracts": "^0.4.4",
         "decimal.js": "^10.2.0",
         "fs": "0.0.1-security",
+        "lzma": "^2.3.2",
         "node-fetch": "^2.6.1",
         "save-file": "^2.3.1",
         "uuid": "^8.3.0",
@@ -6365,6 +6366,11 @@
       "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
       "dev": true
     },
+    "lzma": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/lzma/-/lzma-2.3.2.tgz",
+      "integrity": "sha1-N4OySFi5wOdHoN88vx+1/KqSxEE="
+    },
     "macos-release": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",

package.json

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

src/hooks/useCompute/useCompute.ts

@@ -82,7 +82,7 @@ function useCompute(): UseCompute {
         computeService,
         rawAlgorithmMeta
       )
-      const order = await ocean.compute.order(
+      const tokenTransfer = await ocean.compute.order(
         accountId,
         did,
         computeService.index,
@@ -91,18 +91,18 @@ function useCompute(): UseCompute {
       )
 
       setStep(1)
-      const computeOrder = JSON.parse(order)
-      Logger.log('compute order', computeOrder)
-      const tokenTransfer = await ocean.datatokens.transferWei(
-        computeOrder.dataToken,
-        computeOrder.to,
-        String(computeOrder.numTokens),
-        computeOrder.from
-      )
+      // const computeOrder = JSON.parse(order)
+      // Logger.log('compute order', computeOrder)
+      // const tokenTransfer = await ocean.datatokens.transferWei(
+      //   computeOrder.dataToken,
+      //   computeOrder.to,
+      //   String(computeOrder.numTokens),
+      //   computeOrder.from
+      // )
       setStep(2)
       const response = await ocean.compute.start(
         did,
-        (tokenTransfer as any).transactionHash,
+        tokenTransfer,
         dataTokenAddress,
         account,
         undefined,

src/hooks/useConsume/useConsume.ts

@@ -50,27 +50,27 @@ function useConsume(): UseConsume {
       await checkAndBuyDT(ocean, dataTokenAddress, account, config)
 
       setStep(1)
-      const order = await ocean.assets.order(
+      const tokenTransfer = await ocean.assets.order(
         did as string,
         serviceType,
         accountId
       )
-      Logger.log('order created', order)
+      Logger.log('order created', tokenTransfer)
       setStep(2)
-      const res = JSON.parse(order)
-      Logger.log('order parsed', res)
-      Logger.log('ocean.datatokens before transfer', ocean.datatokens)
-      const tokenTransfer = await ocean.datatokens.transferWei(
-        res.dataToken,
-        res.to,
-        String(res.numTokens),
-        res.from
-      )
-      Logger.log('token transfered', tokenTransfer)
+      // const res = JSON.parse(order)
+      // Logger.log('order parsed', res)
+      // Logger.log('ocean.datatokens before transfer', ocean.datatokens)
+      // const tokenTransfer = await ocean.datatokens.transferWei(
+      //   res.dataToken,
+      //   res.to,
+      //   String(res.numTokens),
+      //   res.from
+      // )
+      // Logger.log('token transfered', tokenTransfer)
       setStep(3)
       await ocean.assets.download(
         did as string,
-        (tokenTransfer as any).transactionHash,
+        tokenTransfer,
         dataTokenAddress,
         account,
         ''

src/hooks/usePublish/usePublish.ts

@@ -107,7 +107,7 @@ function usePublish(): UsePublish {
       const timeout = 0
       const services: Service[] = []
 
-      const price = ocean.datatokens.toWei('1')
+      const price = '1'
       switch (serviceType) {
         case 'access': {
           const accessService = await ocean.assets.createAccessServiceAttributes(