Merge branch 'main' into fix-ipfs-test

oceanprotocol · Sep 26, 2024 · 3aa1e2d · 3aa1e2d
2 parents 53d17a2 + aeae593
commit 3aa1e2d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/contracts/NFTFactory.ts b/src/contracts/NFTFactory.ts
@@ -82,11 +82,17 @@ export class NftFactory extends SmartContractWithAddress {
         nftData.transferable,
         nftData.owner
       )
+      if (!tx) {
+        const e =
+          'Tx for deploying new NFT contract does not exist or status is not successful.'
+        console.error(e)
+        throw e
+      }
       const trxReceipt = await tx.wait()
       const events = getEventFromTx(trxReceipt, 'NFTCreated')
       return events.args[0]
     } catch (e) {
-      console.error(`Creation of AccessList failed: ${e}`)
+      console.error(`Creation of NFT failed: ${e}`)
     }
   }
 

diff --git a/src/utils/OrderUtils.ts b/src/utils/OrderUtils.ts
@@ -189,7 +189,7 @@ export async function orderAsset(
         )
         const txApprove = typeof tx !== 'number' ? await tx.wait() : tx
         if (!txApprove) {
-          throw new Error(`Failed to appove ${exchange.baseToken} !`)
+          throw new Error(`Failed to approve ${exchange.baseToken} !`)
         }
         const freTx = await fre.buyDatatokens(
           exchange.exchangeId,
@@ -220,10 +220,12 @@ export async function orderAsset(
           price,
           false
         )
-
+        if (!tx) {
+          throw new Error(`Failed to approve ${exchange.baseToken} !`)
+        }
         const txApprove = typeof tx !== 'number' ? await tx.wait() : tx
         if (!txApprove) {
-          return
+          throw new Error(`Failed to confirm/mine approval transaction!`)
         }
         const txBuy = await datatoken.buyFromFreAndOrder(
           asset.datatokens[datatokenIndex].address,