@manifoldxyz/marketplace-sdk 3.0.7-beta.1 → 3.0.7-beta.2

package/dist/lib/MarketplaceListing.js

@@ -619,10 +619,10 @@ class MarketplaceListing {
                 return true;
             if (this.version == 1) {
                 if (!this.listing.erc20) {
-                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true), 'verify', [(0, Web3Protocol_1.getConnectedAddress)(), amount]);
+                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verify', [(0, Web3Protocol_1.getConnectedAddress)(), amount]);
                 }
                 else {
-                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true), 'verify', [(0, Web3Protocol_1.getConnectedAddress)(), this.listing.erc20, amount]);
+                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verify', [(0, Web3Protocol_1.getConnectedAddress)(), this.listing.erc20, amount]);
                 }
             }
             else if (this.version == 2) {
@@ -638,15 +638,15 @@ class MarketplaceListing {
                 }
                 if (useView) {
                     try {
-                        return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true), 'verifyView', [this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
+                        return yield (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verifyView', [this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
                     }
                     catch (e) {
                         // Not using verify view, try checkVerify
-                        return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true), 'checkVerify', [this.contractAddress, this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
+                        return yield (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'checkVerify', [this.contractAddress, this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
                     }
                 }
                 else {
-                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true), 'verify', [this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
+                    return (0, Web3Protocol_1.callWeb3)(this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true), 'verify', [this.listing.id, (0, Web3Protocol_1.getConnectedAddress)(), this.listing.tokenAddress, tokenId, count, amount, this.listing.erc20 || NULL_ADDRESS, data]);
                 }
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manifoldxyz/marketplace-sdk",
-  "version": "3.0.7-beta.1",
+  "version": "3.0.7-beta.2",
   "typings": "dist/index.d.ts",
   "description": "",
   "main": "dist/index.js",

package/src/lib/MarketplaceListing.ts

@@ -180,7 +180,7 @@ class MarketplaceListing {
     return contract
   }
 
-  private _getIdentityVerifierContract(version: number, useView: boolean = false, errorOnNoContract = true, bridge = false): Contract | undefined {
+  private _getIdentityVerifierContract(version: number, useView = false, errorOnNoContract = true, bridge = false): Contract | undefined {
     if (!this.listing?.identityVerifier) throw new Error("Could not get a contract instance")
     if (!Object.keys(identityVerifierMapping).includes(version.toString())) {
       throw new Error("Invalid marketplace version provided")
@@ -627,16 +627,17 @@ class MarketplaceListing {
    * @returns
    */
   public async checkIdentityVerifier(amount: string | number, count = 1, data = "0x", useView = false) : Promise<boolean> {
+
     if (!this.listing!.identityVerifier) return true
 
     if (this.version == 1) {
       if (!this.listing!.erc20) {
         return callWeb3(
-          this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true)!, 'verify', [getConnectedAddress(), amount]
+          this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true)!, 'verify', [getConnectedAddress(), amount]
         )
       } else {
         return callWeb3(
-          this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true)!, 'verify', [getConnectedAddress(), this.listing!.erc20, amount]
+          this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true)!, 'verify', [getConnectedAddress(), this.listing!.erc20, amount]
         )
       }
     } else if (this.version == 2) {
@@ -651,18 +652,18 @@ class MarketplaceListing {
       }
       if (useView) {
         try {
-          return callWeb3(
-            this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true)!, 'verifyView', [this.listing!.id, getConnectedAddress(), this.listing!.tokenAddress, tokenId, count, amount, this.listing!.erc20 || NULL_ADDRESS, data]
+          return await callWeb3(
+            this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true)!, 'verifyView', [this.listing!.id, getConnectedAddress(), this.listing!.tokenAddress, tokenId, count, amount, this.listing!.erc20 || NULL_ADDRESS, data]
           )
         } catch (e) {
           // Not using verify view, try checkVerify
-          return callWeb3(
-            this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true)!, 'checkVerify', [this.contractAddress, this.listing!.id, getConnectedAddress(), this.listing!.tokenAddress, tokenId, count, amount, this.listing!.erc20 || NULL_ADDRESS, data]
+          return await callWeb3(
+            this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true)!, 'checkVerify', [this.contractAddress, this.listing!.id, getConnectedAddress(), this.listing!.tokenAddress, tokenId, count, amount, this.listing!.erc20 || NULL_ADDRESS, data]
           )
         }
       } else {
         return callWeb3(
-          this._getIdentityVerifierContract(this.version), this._getIdentityVerifierContract(this.version, false, true, true)!, 'verify', [this.listing!.id, getConnectedAddress(), this.listing!.tokenAddress, tokenId, count, amount, this.listing!.erc20 || NULL_ADDRESS, data]
+          this._getIdentityVerifierContract(this.version, useView), this._getIdentityVerifierContract(this.version, useView, true, true)!, 'verify', [this.listing!.id, getConnectedAddress(), this.listing!.tokenAddress, tokenId, count, amount, this.listing!.erc20 || NULL_ADDRESS, data]
         )
       }
     } else {