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/Publish.tsx

@@ -7,7 +7,7 @@ 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: {

package.json

@@ -25,7 +25,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@oceanprotocol/lib": "^0.2.5",
+    "@oceanprotocol/lib": "^0.3.1",
     "axios": "^0.20.0",
     "decimal.js": "^10.2.0",
     "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,
         ''