Merge branch 'main' into jonfung/UnifiedContextualLogging

dydxprotocol · Dec 12, 2023 · 51aad9a · 51aad9a
2 parents 112ddb7 + 0a01da5
commit 51aad9a
Show file tree

Hide file tree

Showing 187 changed files with 7,695 additions and 1,493 deletions.
diff --git a/indexer/packages/postgres/src/constants.ts b/indexer/packages/postgres/src/constants.ts
@@ -4,6 +4,7 @@ import config from './config';
 import AssetModel from './models/asset-model';
 import AssetPositionModel from './models/asset-position-model';
 import FillModel from './models/fill-model';
+import FundingIndexUpdatesModel from './models/funding-index-updates-model';
 import LiquidityTiersModel from './models/liquidity-tiers-model';
 import MarketModel from './models/market-model';
 import OraclePriceModel from './models/oracle-price-model';
@@ -89,6 +90,7 @@ export const SQL_TO_JSON_DEFINED_MODELS = [
   AssetModel,
   AssetPositionModel,
   FillModel,
+  FundingIndexUpdatesModel,
   LiquidityTiersModel,
   MarketModel,
   OraclePriceModel,

diff --git a/indexer/packages/postgres/src/index.ts b/indexer/packages/postgres/src/index.ts
@@ -6,6 +6,7 @@ export { postgresConfigSchema } from './config';
 export { default as AssetModel } from './models/asset-model';
 export { default as AssetPositionModel } from './models/asset-position-model';
 export { default as FillModel } from './models/fill-model';
+export { default as FundingIndexUpdatesModel } from './models/funding-index-updates-model';
 export { default as LiquidityTiersModel } from './models/liquidity-tiers-model';
 export { default as MarketModel } from './models/market-model';
 export { default as OraclePriceModel } from './models/oracle-price-model';

diff --git a/indexer/packages/postgres/src/models/funding-index-updates-model.ts b/indexer/packages/postgres/src/models/funding-index-updates-model.ts
@@ -66,6 +66,25 @@ export default class FundingIndexUpdatesModel extends Model {
     };
   }
 
+  /**
+   * A mapping from column name to JSON conversion expected.
+   * See getSqlConversionForDydxModelTypes for valid conversions.
+   *
+   * TODO(IND-239): Ensure that jsonSchema() / sqlToJsonConversions() / model fields match.
+   */
+  static get sqlToJsonConversions() {
+    return {
+      id: 'string',
+      perpetualId: 'string',
+      eventId: 'hex-string',
+      rate: 'string',
+      oraclePrice: 'string',
+      fundingIndex: 'string',
+      effectiveAt: 'date-time',
+      effectiveAtHeight: 'string',
+    };
+  }
+
   id!: string;
 
   perpetualId!: string;