Merge pull request #159 from oceanprotocol/feature/usePreviousValidOrder

usePreviousOrder

src/hooks/useCompute/useCompute.ts

@@ -56,47 +56,49 @@ function useCompute(): UseCompute {
     dataTokenAddress: string,
     algorithmRawCode: string,
     computeContainer: ComputeValue,
-    marketFeeAddress?: string
+    marketFeeAddress?: string,
+    orderId?: string
   ): Promise<ComputeJob | void> {
     if (!ocean || !account) return
-
     setComputeError(undefined)
-
     try {
       setIsLoading(true)
       setStep(0)
-
+      rawAlgorithmMeta.container = computeContainer
-      const userOwnedTokens = await ocean.accounts.getTokenBalance(
+      rawAlgorithmMeta.rawcode = algorithmRawCode
-        dataTokenAddress,
+      const output = {}
-        account
+      if (!orderId) {
-      )
+        const userOwnedTokens = await ocean.accounts.getTokenBalance(
-      if (parseFloat(userOwnedTokens) < 1) {
+          dataTokenAddress,
-        setComputeError('Not enough datatokens')
+          account
-      } else {
-        rawAlgorithmMeta.container = computeContainer
-        rawAlgorithmMeta.rawcode = algorithmRawCode
-        const output = {}
-        Logger.log(
-          'compute order',
-          accountId,
-          did,
-          computeService,
-          rawAlgorithmMeta,
-          marketFeeAddress
         )
-        const tokenTransfer = await ocean.compute.order(
+        if (parseFloat(userOwnedTokens) < 1) {
-          accountId,
+          setComputeError('Not enough datatokens')
-          did,
+        } else {
-          computeService.index,
+          Logger.log(
-          undefined,
+            'compute order',
-          rawAlgorithmMeta,
+            accountId,
-          marketFeeAddress
+            did,
-        )
+            computeService,
-        setStep(1)
+            rawAlgorithmMeta,
-        setStep(2)
+            marketFeeAddress
+          )
+          orderId = await ocean.compute.order(
+            accountId,
+            did,
+            computeService.index,
+            undefined,
+            rawAlgorithmMeta,
+            marketFeeAddress
+          )
+          setStep(1)
+        }
+      }
+      setStep(2)
+      if (orderId) {
         const response = await ocean.compute.start(
           did,
-          tokenTransfer,
+          orderId,
           dataTokenAddress,
           account,
           undefined,

src/hooks/useConsume/useConsume.ts

@@ -32,7 +32,8 @@ function useConsume(): UseConsume {
     did: DID | string,
     dataTokenAddress: string,
     serviceType: ServiceType = 'access',
-    marketFeeAddress: string
+    marketFeeAddress: string,
+    orderId?: string
   ): Promise<void> {
     if (!ocean || !account || !accountId) return
 
@@ -41,34 +42,37 @@ function useConsume(): UseConsume {
 
     try {
       setStep(0)
-      const userOwnedTokens = await ocean.accounts.getTokenBalance(
+      if (!orderId) {
-        dataTokenAddress,
+        // if we don't have a previous valid order, get one
-        account
+        const userOwnedTokens = await ocean.accounts.getTokenBalance(
-      )
+          dataTokenAddress,
-      if (parseFloat(userOwnedTokens) < 1) {
+          account
-        setConsumeError('Not enough datatokens')
-      } else {
-        setStep(1)
-        ocean.datatokens.generateDtName()
-        const tokenTransfer = await ocean.assets.order(
-          did as string,
-          serviceType,
-          accountId,
-          undefined,
-          marketFeeAddress
         )
-        Logger.log('order created', tokenTransfer)
+        if (parseFloat(userOwnedTokens) < 1) {
-        setStep(2)
+          setConsumeError('Not enough datatokens')
-        setStep(3)
+        } else {
+          setStep(1)
+          orderId = await ocean.assets.order(
+            did as string,
+            serviceType,
+            accountId,
+            undefined,
+            marketFeeAddress
+          )
+          Logger.log('order created', orderId)
+          setStep(2)
+        }
+      }
+      setStep(3)
+      if (orderId)
         await ocean.assets.download(
           did as string,
-          tokenTransfer,
+          orderId,
           dataTokenAddress,
           account,
           ''
         )
-        setStep(4)
+      setStep(4)
-      }
     } catch (error) {
       setConsumeError(error.message)
       Logger.error(error)