Merge pull request #49 from decentraland/fix/multiple-open-orders-eth

fix: add close active order logic for eth
decentraland · Jan 14, 2025 · 40b0eef · 40b0eef
2 parents 978103a + 7773653
commit 40b0eef
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/src/eth/handlers/marketplace.ts b/src/eth/handlers/marketplace.ts
@@ -83,15 +83,34 @@ export function handleOrderCreated(
     order.createdAt = timestamp;
     order.updatedAt = timestamp;
 
-    if (nft.activeOrder) {
-      const oldOrder = orders.get(nft.activeOrder.id);
+    const currentOpenOrder = Array.from(orders.values()).reduce<Order | null>(
+      (newestOrder, currentOrder) => {
+        if (
+          currentOrder.nftAddress === nft.contractAddress &&
+          currentOrder.tokenId === nft.tokenId &&
+          currentOrder.status === OrderStatus.open &&
+          (!newestOrder || currentOrder.createdAt > newestOrder.createdAt)
+        ) {
+          return currentOrder;
+        }
+        return newestOrder;
+      },
+      null
+    );
+
+    if (nft.activeOrder && !currentOpenOrder) {
+      console.log(
+        `ERROR: Active order not found for NFT ${nft.id} and order ${nft.activeOrder.id}`
+      );
+    }
+
+    if (nft.activeOrder || currentOpenOrder) {
+      const oldOrder = currentOpenOrder || nft.activeOrder;
 
       if (oldOrder) {
         cancelActiveOrder(oldOrder, timestamp);
       } else {
-        console.log(
-          `ERROR: Order not found when trying to cancel order ${nft.activeOrder.id}`
-        );
+        console.log(`ERROR: Order not found when trying to cancel order ${id}`);
       }
     }
     nft.updatedAt = timestamp;

diff --git a/src/polygon/handlers/marketplace.ts b/src/polygon/handlers/marketplace.ts
@@ -79,7 +79,7 @@ export function handleOrderCreated(
     order.updatedAt = timestamp;
 
     // get open order for the nft since nft.activeOrder can be undefined but an order could still be open
-    const nftActiveOrder = Array.from(orders.values()).reduce<Order | null>(
+    const currentOpenOrder = Array.from(orders.values()).reduce<Order | null>(
       (newestOrder, currentOrder) => {
         if (
           currentOrder.nftAddress === nft.contractAddress &&
@@ -94,15 +94,14 @@ export function handleOrderCreated(
       null
     );
 
-    if (nft.activeOrder && !nftActiveOrder) {
+    if (nft.activeOrder && !currentOpenOrder) {
       console.log(
         `ERROR: Active order not found for NFT ${nft.id} and order ${nft.activeOrder.id}`
       );
     }
 
-    if (nft.activeOrder || nftActiveOrder) {
-      const id = nft.activeOrder ? nft.activeOrder.id : nftActiveOrder?.id;
-      const oldOrder = id ? orders.get(id) : null;
+    if (nft.activeOrder || currentOpenOrder) {
+      const oldOrder = currentOpenOrder || nft.activeOrder;
 
       if (oldOrder) {
         cancelActiveOrder(oldOrder, timestamp);