fixes

dydxprotocol · Sep 23, 2024 · c3e9520 · c3e9520
1 parent a319b41
commit c3e9520
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 30 deletions.
diff --git a/indexer/services/ender/__tests__/handlers/funding-handler.test.ts b/indexer/services/ender/__tests__/handlers/funding-handler.test.ts
@@ -19,7 +19,6 @@ import {
   TendermintEventTable,
   testConstants,
   testMocks,
-  PerpetualMarketTable, PerpetualMarketFromDatabase,
 } from '@dydxprotocol-indexer/postgres';
 import { DydxIndexerSubtypes, FundingEventMessage } from '../../src/lib/types';
 import { createIndexerTendermintBlock, createIndexerTendermintEvent } from '../helpers/indexer-proto-helpers';
@@ -119,15 +118,6 @@ describe('fundingHandler', () => {
   });
 
   it('successfully processes single premium sample event', async () => {
-    // get and print perpetual markets
-    // const perpetualMarkets = await PerpetualMarketTable.findA
-
-    const perpetualMarkets: PerpetualMarketFromDatabase[] = await PerpetualMarketTable.findAll(
-      {},
-      [],
-      { readReplica: true },
-    );
-    console.log('perpetualMarkets before', perpetualMarkets);
     const kafkaMessage: KafkaMessage = createKafkaMessageFromFundingEvents({
       fundingEvents: [defaultFundingUpdateSampleEvent],
       height: defaultHeight,

diff --git a/indexer/services/ender/src/handlers/funding-handler.ts b/indexer/services/ender/src/handlers/funding-handler.ts
@@ -1,7 +1,6 @@
 import { logger, stats } from '@dydxprotocol-indexer/base';
 import {
   FundingIndexUpdatesTable,
-  PerpetualMarketFromDatabase,
   TendermintEventTable,
   protocolTranslations,
   PerpetualMarketModel,
@@ -52,18 +51,17 @@ export class FundingHandler extends Handler<FundingEventMessage> {
 
   // eslint-disable-next-line @typescript-eslint/require-await
   public async internalHandle(resultRow: pg.QueryResultRow): Promise<ConsolidatedKafkaEvent[]> {
-    console.log('handle yo');
-    console.log(`resultRow.perpetual_markets: ${JSON.stringify(resultRow.perpetual_markets)}`);
-
     const perpetualMarkets:
-    Map<string, FilteredPerpetualMarketFromDatabase> = new Map<string, FilteredPerpetualMarketFromDatabase>();
+    Map<string, FilteredPerpetualMarketFromDatabase> = new
+    Map<string, FilteredPerpetualMarketFromDatabase>();
     for (const [key, perpetualMarket] of Object.entries(resultRow.perpetual_markets)) {
       perpetualMarkets.set(
         key,
-        PerpetualMarketModel.fromJson(perpetualMarket as object) as FilteredPerpetualMarketFromDatabase,
+        PerpetualMarketModel.fromJson(
+          perpetualMarket as object,
+        ) as FilteredPerpetualMarketFromDatabase,
       );
     }
-    console.log('perpetualMarkets', perpetualMarkets);
     const fundingIndices:
     Map<string, FundingIndexUpdatesFromDatabase> = new
     Map<string, FundingIndexUpdatesFromDatabase>();
@@ -91,7 +89,9 @@ export class FundingHandler extends Handler<FundingEventMessage> {
       }
 
       const perpetualMarket:
-        FilteredPerpetualMarketFromDatabase | undefined = perpetualMarkets.get(update.perpetualId.toString());
+      FilteredPerpetualMarketFromDatabase | undefined = perpetualMarkets.get(
+        update.perpetualId.toString(),
+      );
       logger.info({
         at: 'FundingHandler#handleFundingSample',
         message: 'processing funding update',

diff --git a/indexer/services/ender/src/handlers/order-fills/abstract-order-fill-handler.ts b/indexer/services/ender/src/handlers/order-fills/abstract-order-fill-handler.ts
@@ -1,7 +1,8 @@
 import {
   FillFromDatabase,
   FillType,
-  fillTypeToTradeType, FilteredPerpetualMarketFromDatabase,
+  fillTypeToTradeType,
+  FilteredPerpetualMarketFromDatabase,
   Liquidity,
   OrderFromDatabase,
   OrderSide,

diff --git a/indexer/services/ender/src/handlers/order-fills/liquidation-handler.ts b/indexer/services/ender/src/handlers/order-fills/liquidation-handler.ts
@@ -1,14 +1,14 @@
 import {
   FillFromDatabase,
-  FillModel, FilteredPerpetualMarketFromDatabase,
+  FillModel,
+  FilteredPerpetualMarketFromDatabase,
   Liquidity,
   MarketFromDatabase,
   MarketModel,
   OrderFromDatabase,
   OrderModel,
   OrderStatus,
   OrderTable,
-  PerpetualMarketFromDatabase,
   PerpetualMarketModel,
   perpetualMarketRefresher,
   PerpetualPositionFromDatabase,

diff --git a/indexer/services/ender/src/scripts/handlers/dydx_funding_handler.sql b/indexer/services/ender/src/scripts/handlers/dydx_funding_handler.sql
@@ -36,15 +36,18 @@ DECLARE
 BEGIN
     FOR funding_update IN SELECT * FROM jsonb_array_elements(event_data->'updates') LOOP
         perpetual_id = (funding_update->'perpetualId')::bigint;
-        perpetual_market_record = dydx_get_perpetual_market_for_id(perpetual_id);
-        RAISE NOTICE 'perpetual_id: %, perpetual_market_record: %', perpetual_id, perpetual_market_record;
-
-        IF NOT FOUND THEN
-            errors_response = array_append(errors_response, '"Received FundingUpdate with unknown perpetualId."'::jsonb);
-            CONTINUE;
-        END IF;
-
-        perpetual_markets_response = jsonb_set(perpetual_markets_response, ARRAY[(perpetual_market_record."id")::text], dydx_to_jsonb(perpetual_market_record));
+        BEGIN
+            perpetual_market_record = dydx_get_perpetual_market_for_id(perpetual_id);
+            perpetual_markets_response = jsonb_set(perpetual_markets_response, ARRAY[(perpetual_market_record."id")::text], dydx_to_jsonb(perpetual_market_record));
+        EXCEPTION
+            WHEN OTHERS THEN
+                IF SQLERRM LIKE 'Unable to find perpetual market with id%' THEN
+                    errors_response = array_append(errors_response, '"Received FundingUpdate with unknown perpetualId."'::jsonb);
+                    CONTINUE;
+                ELSE
+                    RAISE;
+                END IF;
+        END;
 
         CASE event_data->'type'
             WHEN TYPE_PREMIUM_SAMPLE THEN