Merge branch 'main' into issue-1841-pub-flow

oceanprotocol · Sep 24, 2024 · 7da351b · 7da351b
2 parents 6ea2ea2 + eb6d84e
commit 7da351b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -186,7 +186,6 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: coverage-integration
-
       - uses: paambaati/codeclimate-action@v2.7.5
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/contracts/NFTFactory.ts b/src/contracts/NFTFactory.ts
@@ -67,23 +67,27 @@ export class NftFactory extends SmartContractWithAddress {
     )
     if (estimateGas) return <G extends false ? string : BigNumber>estGas
     // Invoke createToken function of the contract
-    const tx = await sendTx(
-      estGas,
-      this.signer,
-      this.config?.gasFeeMultiplier,
-      this.contract.deployERC721Contract,
-      nftData.name,
-      nftData.symbol,
-      nftData.templateIndex,
-      ZERO_ADDRESS,
-      ZERO_ADDRESS,
-      nftData.tokenURI,
-      nftData.transferable,
-      nftData.owner
-    )
-    const trxReceipt = await tx.wait()
-    const events = getEventFromTx(trxReceipt, 'NFTCreated')
-    return events.args[0]
+    try {
+      const tx = await sendTx(
+        estGas,
+        this.signer,
+        this.config?.gasFeeMultiplier,
+        this.contract.deployERC721Contract,
+        nftData.name,
+        nftData.symbol,
+        nftData.templateIndex,
+        ZERO_ADDRESS,
+        ZERO_ADDRESS,
+        nftData.tokenURI,
+        nftData.transferable,
+        nftData.owner
+      )
+      const trxReceipt = await tx.wait()
+      const events = getEventFromTx(trxReceipt, 'NFTCreated')
+      return events.args[0]
+    } catch (e) {
+      console.error(`Creation of AccessList failed: ${e}`)
+    }
   }
 
   /**