Merge pull request #52 from trader-xyz/fix/validate-order-status

Fixes order check for fill ability incorrectly aggregating approval status

Author: johnrjj

src/sdk/v4/NftSwapV4.ts

@@ -931,10 +931,12 @@ class NftSwapV4 implements INftSwapV4 {
     const hasBalance: boolean = takerBalance.gte(
       (takerAsset as UserFacingERC20AssetDataSerializedV4).amount ?? 1
     );
+
     const isApproved: boolean =
-      takerApprovalStatus.tokenIdApproved ??
-      takerApprovalStatus.contractApproved ??
+      takerApprovalStatus.contractApproved ||
+      takerApprovalStatus.tokenIdApproved ||
       false;
+
     const canOrderBeFilled: boolean = hasBalance && isApproved;
 
     return {
@@ -965,8 +967,8 @@ class NftSwapV4 implements INftSwapV4 {
       (makerAsset as UserFacingERC20AssetDataSerializedV4).amount ?? 1
     );
     const isApproved: boolean =
-      makerApprovalStatus.tokenIdApproved ??
-      makerApprovalStatus.contractApproved ??
+      makerApprovalStatus.tokenIdApproved ||
+      makerApprovalStatus.contractApproved ||
       false;
     const canOrderBeFilled: boolean = hasBalance && isApproved;
 

test/v4/utils.test.ts

@@ -97,6 +97,13 @@ describe('NFTSwapV4', () => {
       v4Erc721SignedOrder
     );
     expect(isSignatureValid).toBe(true);
+
+    const orderStatusData =
+      await nftSwapperMaker.checkOrderCanBeFilledMakerSide(v4Erc721SignedOrder);
+
+    expect(orderStatusData.canOrderBeFilled).toBe(true);
+    expect(orderStatusData.approvalStatus.contractApproved).toBe(true);
+    expect(orderStatusData.hasBalance).toBe(true);
   });
 
   it('utility functions on class work properly with erc721 buy order', async () => {
@@ -142,11 +149,17 @@ describe('NFTSwapV4', () => {
       makerAsset,
       v4Erc721SignedOrder.maker
     );
-    expect(makerApprovalStatus.contractApproved).toBe(true);
 
     const isSignatureValid = await nftSwapperMaker.validateSignature(
       v4Erc721SignedOrder
     );
     expect(isSignatureValid).toBe(true);
+
+    const orderStatusData =
+      await nftSwapperMaker.checkOrderCanBeFilledMakerSide(v4Erc721SignedOrder);
+
+    expect(orderStatusData.canOrderBeFilled).toBe(true);
+    expect(orderStatusData.approvalStatus.contractApproved).toBe(true);
+    expect(orderStatusData.hasBalance).toBe(true);
   });
 });