Fix bug with socks subaccount subscription with best effort canceled …

…logic. (#2718)
dydxprotocol · Feb 10, 2025 · a601005 · a601005
1 parent d425749
commit a601005
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 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
@@ -492,11 +492,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
@@ -59,7 +59,7 @@ describe('Subscriptions', () => {
     [Channel.V4_ACCOUNTS]: [
       '/v4/addresses/.+/subaccountNumber/.+',
       '/v4/orders?.+subaccountNumber.+OPEN,UNTRIGGERED,BEST_EFFORT_OPENED',
-      '/v4/orders?.+subaccountNumber.+BEST_EFFORT_CANCELED.+goodTilBlockAfter.+',
+      '/v4/orders?.+subaccountNumber.+BEST_EFFORT_CANCELED.+goodTilBlockAfter=[0-9]+',
     ],
     [Channel.V4_CANDLES]: ['/v4/candles/perpetualMarkets/.+?resolution=.+'],
     [Channel.V4_MARKETS]: ['/v4/perpetualMarkets'],
@@ -68,7 +68,7 @@ describe('Subscriptions', () => {
     [Channel.V4_PARENT_ACCOUNTS]: [
       '/v4/addresses/.+/parentSubaccountNumber/.+',
       '/v4/orders/parentSubaccountNumber?.+parentSubaccountNumber.+OPEN,UNTRIGGERED,BEST_EFFORT_OPENED',
-      '/v4/orders/parentSubaccountNumber?.+parentSubaccountNumber.+BEST_EFFORT_CANCELED.+goodTilBlockAfter.+',
+      '/v4/orders/parentSubaccountNumber?.+parentSubaccountNumber.+BEST_EFFORT_CANCELED.+goodTilBlockAfter=[0-9]+',
     ],
     [Channel.V4_BLOCK_HEIGHT]: ['v4/height'],
   };

diff --git a/indexer/services/socks/src/lib/subscription.ts b/indexer/services/socks/src/lib/subscription.ts
@@ -587,7 +587,7 @@ export class Subscriptions {
         }),
         axiosRequest({
           method: RequestMethod.GET,
-          url: `${COMLINK_URL}/v4/orders?address=${address}&subaccountNumber=${subaccountNumber}&status=BEST_EFFORT_CANCELED&goodTilBlockAfter=$${Math.max(numBlockHeight - 20, 1)}`,
+          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,
@@ -608,6 +608,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.
@@ -694,6 +700,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.