modify NoSpecifiedOrdersAvailable behavior

ProjectOpenSea · Mar 6, 2024 · 63b4fff · 63b4fff
1 parent 8d42251
commit 63b4fff
Show file tree

Hide file tree

Showing 3 changed files with 247 additions and 223 deletions.
diff --git a/reference/lib/ReferenceOrderCombiner.sol b/reference/lib/ReferenceOrderCombiner.sol
@@ -403,7 +403,13 @@ contract ReferenceOrderCombiner is
         }
 
         // Apply criteria resolvers to each order as applicable.
-        _applyCriteriaResolvers(advancedOrders, ordersToExecute, criteriaResolvers);
+        _applyCriteriaResolvers(
+            advancedOrders,
+            ordersToExecute,
+            criteriaResolvers
+        );
+
+        bool someOrderAvailable;
 
         // Iterate over each order to check authorization status (for restricted
         // orders), generate orders (for contract orders), and emit events (for
@@ -500,6 +506,13 @@ contract ReferenceOrderCombiner is
                 spentItems,
                 receivedItems
             );
+
+            someOrderAvailable = true;
+        }
+
+        // Revert if no orders are available.
+        if (!someOrderAvailable) {
+            revert NoSpecifiedOrdersAvailable();
         }
     }
 
@@ -625,11 +638,6 @@ contract ReferenceOrderCombiner is
             );
         }
 
-        // Revert if no orders are available.
-        if (executions.length == 0) {
-            revert NoSpecifiedOrdersAvailable();
-        }
-
         // Perform final checks and compress executions into standard and batch.
         availableOrders = _performFinalChecksAndExecuteOrders(
             advancedOrders,