Merge branch '2025-01-22-test-quote-gas-pr' into minor-update-pr-test

rainlanguage · Jan 25, 2025 · 8cd790c · 8cd790c
2 parents e6d7ce8 + 7492a2e
commit 8cd790c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 30 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,6 +8,7 @@ ENV DOCKER_TAG=$DOCKER_CHANNEL
 
 WORKDIR /arb-bot
 ADD . .
+RUN rm -rf test/*.js test/*.ts test/e2e
 RUN npm install
 RUN npm run build
 CMD node arb-bot

diff --git a/src/cli.ts b/src/cli.ts
@@ -842,7 +842,7 @@ export const main = async (argv: any, version?: string) => {
                             v.sg,
                             lastReadOrdersTimestamp,
                             v.skip,
-                            options.timeout,
+                            // options.timeout,
                             roundSpan,
                         ),
                     ),

diff --git a/src/order.ts b/src/order.ts
@@ -302,20 +302,14 @@ export function prepareOrdersForRound(
         const orderbookBundledOrders: BundledOrders[] = [];
         for (const [, ownerProfile] of ownersProfileMap) {
             let remainingLimit = ownerProfile.limit;
-            const activeOrdersProfiles = Array.from(ownerProfile.orders).filter((v) => v[1].active);
-            let remainingOrdersPairs = activeOrdersProfiles.filter(
-                (v) => v[1].takeOrders.length > 0,
-            );
-            // reset if all orders are already consumed
-            if (remainingOrdersPairs.length === 0) {
-                for (const [, orderProfile] of activeOrdersProfiles) {
-                    orderProfile.takeOrders.push(...orderProfile.consumedTakeOrders.splice(0));
-                }
-                remainingOrdersPairs = activeOrdersProfiles;
-            }
+            const activeOrdersProfiles = Array.from(ownerProfile.orders);
             // consume orders limits
-            for (const [orderHash, orderProfile] of remainingOrdersPairs) {
-                if (remainingLimit > 0) {
+            for (const [orderHash, orderProfile] of activeOrdersProfiles) {
+                if (
+                    remainingLimit > 0 &&
+                    orderProfile.active &&
+                    orderProfile.takeOrders.length > 0
+                ) {
                     const consumingOrderPairs = orderProfile.takeOrders.splice(0, remainingLimit);
                     remainingLimit -= consumingOrderPairs.length;
                     orderProfile.consumedTakeOrders.push(...consumingOrderPairs);
@@ -326,20 +320,22 @@ export function prepareOrdersForRound(
             // reset and start consuming again from top until limit is reached
             if (remainingLimit > 0) {
                 for (const [orderHash, orderProfile] of activeOrdersProfiles) {
-                    orderProfile.takeOrders.push(...orderProfile.consumedTakeOrders.splice(0));
-                    if (remainingLimit > 0) {
-                        const consumingOrderPairs = orderProfile.takeOrders.splice(
-                            0,
-                            remainingLimit,
-                        );
-                        remainingLimit -= consumingOrderPairs.length;
-                        orderProfile.consumedTakeOrders.push(...consumingOrderPairs);
-                        gatherPairs(
-                            orderbook,
-                            orderHash,
-                            consumingOrderPairs,
-                            orderbookBundledOrders,
-                        );
+                    if (orderProfile.active) {
+                        orderProfile.takeOrders.push(...orderProfile.consumedTakeOrders.splice(0));
+                        if (remainingLimit > 0) {
+                            const consumingOrderPairs = orderProfile.takeOrders.splice(
+                                0,
+                                remainingLimit,
+                            );
+                            remainingLimit -= consumingOrderPairs.length;
+                            orderProfile.consumedTakeOrders.push(...consumingOrderPairs);
+                            gatherPairs(
+                                orderbook,
+                                orderHash,
+                                consumingOrderPairs,
+                                orderbookBundledOrders,
+                            );
+                        }
                     }
                 }
             }

diff --git a/src/query.ts b/src/query.ts
@@ -254,10 +254,10 @@ export async function getOrderChanges(
     subgraph: string,
     startTimestamp: number,
     skip: number,
-    timeout?: number,
+    // timeout?: number,
     span?: Span,
 ) {
-    timeout;
+    // timeout;
     let skip_ = skip;
     let count = 0;
     const allResults: SgTx[] = [];