Fix bug with socks subaccount subscription with best effort canceled …

…logic. (#2718) (cherry picked from commit a601005) # Conflicts: # indexer/services/socks/__tests__/lib/subscriptions.test.ts # indexer/services/socks/src/lib/subscription.ts
dydxprotocol · Feb 18, 2025 · 74ff12c · 74ff12c
1 parent a0de470
commit 74ff12c
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/indexer/services/comlink/src/controllers/api/v4/orders-controller.ts b/indexer/services/comlink/src/controllers/api/v4/orders-controller.ts
@@ -462,11 +462,23 @@ router.get(
         options: { gt: 0 },
       },
     },
+    goodTilBlockAfter: {
+      in: 'query',
+      optional: true,
+      isInt: {
+        options: { gt: 0 },
+      },
+    },
     goodTilBlockTimeBeforeOrAt: {
       in: 'query',
       optional: true,
       isISO8601: true,
     },
+    goodTilBlockTimeAfter: {
+      in: 'query',
+      optional: true,
+      isISO8601: true,
+    },
     returnLatestOrders: {
       in: 'query',
       isBoolean: true,

diff --git a/indexer/services/socks/__tests__/lib/subscriptions.test.ts b/indexer/services/socks/__tests__/lib/subscriptions.test.ts
@@ -58,15 +58,25 @@ describe('Subscriptions', () => {
   const initialResponseUrlPatterns: Record<Channel, string[] | undefined> = {
     [Channel.V4_ACCOUNTS]: [
       '/v4/addresses/.+/subaccountNumber/.+',
+<<<<<<< HEAD
       '/v4/orders?.+subaccountNumber.+OPEN,UNTRIGGERED,BEST_EFFORT_OPENED,BEST_EFFORT_CANCELED',
+=======
+      '/v4/orders?.+subaccountNumber.+OPEN,UNTRIGGERED,BEST_EFFORT_OPENED',
+      '/v4/orders?.+subaccountNumber.+BEST_EFFORT_CANCELED.+goodTilBlockAfter=[0-9]+',
+>>>>>>> a6010055 (Fix bug with socks subaccount subscription with best effort canceled logic. (#2718))
     ],
     [Channel.V4_CANDLES]: ['/v4/candles/perpetualMarkets/.+?resolution=.+'],
     [Channel.V4_MARKETS]: ['/v4/perpetualMarkets'],
     [Channel.V4_ORDERBOOK]: ['/v4/orderbooks/perpetualMarket/.+'],
     [Channel.V4_TRADES]: ['/v4/trades/perpetualMarket/.+'],
     [Channel.V4_PARENT_ACCOUNTS]: [
       '/v4/addresses/.+/parentSubaccountNumber/.+',
+<<<<<<< HEAD
       '/v4/orders/parentSubaccountNumber?.+parentSubaccountNumber.+OPEN,UNTRIGGERED,BEST_EFFORT_OPENED,BEST_EFFORT_CANCELED',
+=======
+      '/v4/orders/parentSubaccountNumber?.+parentSubaccountNumber.+OPEN,UNTRIGGERED,BEST_EFFORT_OPENED',
+      '/v4/orders/parentSubaccountNumber?.+parentSubaccountNumber.+BEST_EFFORT_CANCELED.+goodTilBlockAfter=[0-9]+',
+>>>>>>> a6010055 (Fix bug with socks subaccount subscription with best effort canceled logic. (#2718))
     ],
     [Channel.V4_BLOCK_HEIGHT]: ['v4/height'],
   };

diff --git a/indexer/services/socks/src/lib/subscription.ts b/indexer/services/socks/src/lib/subscription.ts
@@ -579,7 +579,19 @@ export class Subscriptions {
           },
           transformResponse: (res) => res,
         }),
+<<<<<<< HEAD
         blockHeightRefresher.getLatestBlockHeight(),
+=======
+        axiosRequest({
+          method: RequestMethod.GET,
+          url: `${COMLINK_URL}/v4/orders?address=${address}&subaccountNumber=${subaccountNumber}&status=BEST_EFFORT_CANCELED&goodTilBlockAfter=${Math.max(numBlockHeight - 20, 1)}`,
+          timeout: config.INITIAL_GET_TIMEOUT_MS,
+          headers: {
+            'cf-ipcountry': country,
+          },
+          transformResponse: (res) => res,
+        }),
+>>>>>>> a6010055 (Fix bug with socks subaccount subscription with best effort canceled logic. (#2718))
       ]);
 
       return JSON.stringify({
@@ -588,6 +600,12 @@ export class Subscriptions {
         blockHeight,
       });
     } catch (error) {
+      logger.error({
+        at: 'getInitialResponseForSubaccountSubscription',
+        message: 'Error on getting initial response for subaccount subscription',
+        id,
+        error,
+      });
       // The subaccounts API endpoint returns a 404 for subaccounts that are not indexed, however
       // such subaccounts can be subscribed to and events can be sent when the subaccounts are
       // indexed to an existing subscription.
@@ -657,6 +675,12 @@ export class Subscriptions {
         blockHeight,
       });
     } catch (error) {
+      logger.error({
+        at: 'getInitialResponseForParentSubaccountSubscription',
+        message: 'Error on getting initial response for subaccount subscription',
+        id,
+        error,
+      });
       // The subaccounts API endpoint returns a 404 for subaccounts that are not indexed, however
       // such subaccounts can be subscribed to and events can be sent when the subaccounts are
       // indexed to an existing subscription.