Organize Ender SQL scripts

dydxprotocol · Dec 8, 2023 · 724d0d7 · 724d0d7
1 parent 501491f
commit 724d0d7
Show file tree

Hide file tree

Showing 52 changed files with 34 additions and 21 deletions.
diff --git a/indexer/services/ender/src/helpers/postgres/postgres-functions.ts b/indexer/services/ender/src/helpers/postgres/postgres-functions.ts
@@ -26,41 +26,47 @@ function newScript(name: string, scriptPath: string): PostgresFunction {
   };
 }
 
-const scripts: string[] = [
-  'create_extension_pg_stat_statements.sql',
-  'create_extension_uuid_ossp.sql',
+const HANDLER_SCRIPTS: string[] = [
   'dydx_asset_create_handler.sql',
-  'dydx_block_processor.sql',
   'dydx_block_processor_ordered_handlers.sql',
   'dydx_block_processor_unordered_handlers.sql',
-  'dydx_clob_pair_status_to_market_status.sql',
   'dydx_deleveraging_handler.sql',
+  'dydx_funding_handler.sql',
+  'dydx_liquidity_tier_handler.sql',
   'dydx_market_create_handler.sql',
   'dydx_market_modify_handler.sql',
   'dydx_market_price_update_handler.sql',
+  'dydx_perpetual_market_handler.sql',
+  'dydx_stateful_order_handler.sql',
+  'dydx_subaccount_update_handler.sql',
+  'dydx_transfer_handler.sql',
+  'dydx_update_clob_pair_handler.sql',
+  'dydx_update_perpetual_handler.sql',
+];
+
+const HELPER_SCRIPTS: string[] = [
+  'create_extension_pg_stat_statements.sql',
+  'create_extension_uuid_ossp.sql',
+  'dydx_clob_pair_status_to_market_status.sql',
+  'dydx_create_initial_rows_for_tendermint_block.sql',
+  'dydx_create_tendermint_event.sql',
+  'dydx_create_transaction.sql',
   'dydx_event_id_from_parts.sql',
   'dydx_from_jsonlib_long.sql',
   'dydx_from_protocol_order_side.sql',
   'dydx_from_protocol_time_in_force.sql',
   'dydx_from_serializable_int.sql',
-  'dydx_funding_handler.sql',
   'dydx_get_fee_from_liquidity.sql',
-  'dydx_get_perpetual_market_for_clob_pair.sql',
   'dydx_get_order_status.sql',
+  'dydx_get_perpetual_market_for_clob_pair.sql',
   'dydx_get_total_filled_from_liquidity.sql',
   'dydx_get_weighted_average.sql',
   'dydx_liquidation_fill_handler_per_order.sql',
-  'dydx_liquidity_tier_handler.sql',
   'dydx_order_fill_handler_per_order.sql',
-  'dydx_perpetual_market_handler.sql',
   'dydx_perpetual_position_and_order_side_matching.sql',
   'dydx_protocol_condition_type_to_order_type.sql',
-  'dydx_stateful_order_handler.sql',
-  'dydx_subaccount_update_handler.sql',
-  'dydx_transfer_handler.sql',
+  'dydx_tendermint_event_to_transaction_index.sql',
   'dydx_trim_scale.sql',
-  'dydx_update_clob_pair_handler.sql',
-  'dydx_update_perpetual_handler.sql',
   'dydx_update_perpetual_position_aggregate_fields.sql',
   'dydx_uuid.sql',
   'dydx_uuid_from_asset_position_parts.sql',
@@ -74,19 +80,25 @@ const scripts: string[] = [
   'dydx_uuid_from_subaccount_id_parts.sql',
   'dydx_uuid_from_transaction_parts.sql',
   'dydx_uuid_from_transfer_parts.sql',
-  'dydx_create_transaction.sql',
-  'dydx_create_initial_rows_for_tendermint_block.sql',
-  'dydx_create_tendermint_event.sql',
-  'dydx_tendermint_event_to_transaction_index.sql',
+];
+
+const MAIN_SCRIPTS: string[] = [
+  'dydx_block_processor.sql',
+];
+
+const SCRIPTS: string[] = [
+  ...HANDLER_SCRIPTS.map((script: string) => `handlers/${script}`),
+  ...HELPER_SCRIPTS.map((script: string) => `helpers/${script}`),
+  ...MAIN_SCRIPTS,
 ];
 
 export async function createPostgresFunctions(): Promise<void> {
   await Promise.all([
     dbHelpers.createModelToJsonFunctions(),
-    ...scripts.map((script: string) => storeHelpers.rawQuery(newScript(script, `../../scripts/${script}`).script, {})
+    ...SCRIPTS.map((script: string) => storeHelpers.rawQuery(newScript(script, `../../scripts/${script}`).script, {})
       .catch((error: Error) => {
         logger.error({
-          at: 'dbHelpers#createModelToJsonFunctions',
+          at: 'postgres-functions#createPostgresFunctions',
           message: `Failed to create or replace function contained in ${script}`,
           error,
         });

diff --git a/indexer/services/ender/src/lib/batched-handlers.ts b/indexer/services/ender/src/lib/batched-handlers.ts
@@ -76,7 +76,8 @@ export class BatchedHandlers {
    */
   public async process(
     kafkaPublisher: KafkaPublisher,
-    resultRow: pg.QueryResultRow): Promise<void> {
+    resultRow: pg.QueryResultRow,
+  ): Promise<void> {
     for (let batchIndex = 0; batchIndex < this.batchedHandlers.length; batchIndex++) {
       const start: number = Date.now();
       const handlerCountMapping: { [key: string]: number } = {};

diff --git a/...src/scripts/dydx_asset_create_handler.sql → ...ts/handlers/dydx_asset_create_handler.sql b/...src/scripts/dydx_asset_create_handler.sql → ...ts/handlers/dydx_asset_create_handler.sql
diff --git a/...dydx_block_processor_ordered_handlers.sql → ...dydx_block_processor_ordered_handlers.sql b/...dydx_block_processor_ordered_handlers.sql → ...dydx_block_processor_ordered_handlers.sql
diff --git a/...dx_block_processor_unordered_handlers.sql → ...dx_block_processor_unordered_handlers.sql b/...dx_block_processor_unordered_handlers.sql → ...dx_block_processor_unordered_handlers.sql
diff --git a/...src/scripts/dydx_deleveraging_handler.sql → ...ts/handlers/dydx_deleveraging_handler.sql b/...src/scripts/dydx_deleveraging_handler.sql → ...ts/handlers/dydx_deleveraging_handler.sql
diff --git a/...nder/src/scripts/dydx_funding_handler.sql → ...scripts/handlers/dydx_funding_handler.sql b/...nder/src/scripts/dydx_funding_handler.sql → ...scripts/handlers/dydx_funding_handler.sql
diff --git a/...c/scripts/dydx_liquidity_tier_handler.sql → .../handlers/dydx_liquidity_tier_handler.sql b/...c/scripts/dydx_liquidity_tier_handler.sql → .../handlers/dydx_liquidity_tier_handler.sql
diff --git a/...rc/scripts/dydx_market_create_handler.sql → ...s/handlers/dydx_market_create_handler.sql b/...rc/scripts/dydx_market_create_handler.sql → ...s/handlers/dydx_market_create_handler.sql
diff --git a/...rc/scripts/dydx_market_modify_handler.sql → ...s/handlers/dydx_market_modify_handler.sql b/...rc/scripts/dydx_market_modify_handler.sql → ...s/handlers/dydx_market_modify_handler.sql
diff --git a/...ipts/dydx_market_price_update_handler.sql → ...lers/dydx_market_price_update_handler.sql b/...ipts/dydx_market_price_update_handler.sql → ...lers/dydx_market_price_update_handler.sql
diff --git a/...scripts/dydx_perpetual_market_handler.sql → ...andlers/dydx_perpetual_market_handler.sql b/...scripts/dydx_perpetual_market_handler.sql → ...andlers/dydx_perpetual_market_handler.sql
diff --git a/...c/scripts/dydx_stateful_order_handler.sql → .../handlers/dydx_stateful_order_handler.sql b/...c/scripts/dydx_stateful_order_handler.sql → .../handlers/dydx_stateful_order_handler.sql
diff --git a/...cripts/dydx_subaccount_update_handler.sql → ...ndlers/dydx_subaccount_update_handler.sql b/...cripts/dydx_subaccount_update_handler.sql → ...ndlers/dydx_subaccount_update_handler.sql
diff --git a/...der/src/scripts/dydx_transfer_handler.sql → ...cripts/handlers/dydx_transfer_handler.sql b/...der/src/scripts/dydx_transfer_handler.sql → ...cripts/handlers/dydx_transfer_handler.sql
diff --git a/...scripts/dydx_update_clob_pair_handler.sql → ...andlers/dydx_update_clob_pair_handler.sql b/...scripts/dydx_update_clob_pair_handler.sql → ...andlers/dydx_update_clob_pair_handler.sql
diff --git a/...scripts/dydx_update_perpetual_handler.sql → ...andlers/dydx_update_perpetual_handler.sql b/...scripts/dydx_update_perpetual_handler.sql → ...andlers/dydx_update_perpetual_handler.sql
diff --git a/...s/create_extension_pg_stat_statements.sql → ...s/create_extension_pg_stat_statements.sql b/...s/create_extension_pg_stat_statements.sql → ...s/create_extension_pg_stat_statements.sql
diff --git a/...rc/scripts/create_extension_uuid_ossp.sql → ...ts/helpers/create_extension_uuid_ossp.sql b/...rc/scripts/create_extension_uuid_ossp.sql → ...ts/helpers/create_extension_uuid_ossp.sql
diff --git a/...ydx_clob_pair_status_to_market_status.sql → ...ydx_clob_pair_status_to_market_status.sql b/...ydx_clob_pair_status_to_market_status.sql → ...ydx_clob_pair_status_to_market_status.sql
diff --git a/...ate_initial_rows_for_tendermint_block.sql → ...ate_initial_rows_for_tendermint_block.sql b/...ate_initial_rows_for_tendermint_block.sql → ...ate_initial_rows_for_tendermint_block.sql
diff --git a/.../scripts/dydx_create_tendermint_event.sql → .../helpers/dydx_create_tendermint_event.sql b/.../scripts/dydx_create_tendermint_event.sql → .../helpers/dydx_create_tendermint_event.sql
diff --git a/...r/src/scripts/dydx_create_transaction.sql → ...ripts/helpers/dydx_create_transaction.sql b/...r/src/scripts/dydx_create_transaction.sql → ...ripts/helpers/dydx_create_transaction.sql
diff --git a/.../src/scripts/dydx_event_id_from_parts.sql → ...ipts/helpers/dydx_event_id_from_parts.sql b/.../src/scripts/dydx_event_id_from_parts.sql → ...ipts/helpers/dydx_event_id_from_parts.sql
diff --git a/...er/src/scripts/dydx_from_jsonlib_long.sql → ...cripts/helpers/dydx_from_jsonlib_long.sql b/...er/src/scripts/dydx_from_jsonlib_long.sql → ...cripts/helpers/dydx_from_jsonlib_long.sql
diff --git a/...scripts/dydx_from_protocol_order_side.sql → ...helpers/dydx_from_protocol_order_side.sql b/...scripts/dydx_from_protocol_order_side.sql → ...helpers/dydx_from_protocol_order_side.sql
diff --git a/...ipts/dydx_from_protocol_time_in_force.sql → ...pers/dydx_from_protocol_time_in_force.sql b/...ipts/dydx_from_protocol_time_in_force.sql → ...pers/dydx_from_protocol_time_in_force.sql
diff --git a/...rc/scripts/dydx_from_serializable_int.sql → ...ts/helpers/dydx_from_serializable_int.sql b/...rc/scripts/dydx_from_serializable_int.sql → ...ts/helpers/dydx_from_serializable_int.sql
diff --git a/...c/scripts/dydx_get_fee_from_liquidity.sql → ...s/helpers/dydx_get_fee_from_liquidity.sql b/...c/scripts/dydx_get_fee_from_liquidity.sql → ...s/helpers/dydx_get_fee_from_liquidity.sql
diff --git a/...der/src/scripts/dydx_get_order_status.sql → ...scripts/helpers/dydx_get_order_status.sql b/...der/src/scripts/dydx_get_order_status.sql → ...scripts/helpers/dydx_get_order_status.sql
diff --git a/...dx_get_perpetual_market_for_clob_pair.sql → ...dx_get_perpetual_market_for_clob_pair.sql b/...dx_get_perpetual_market_for_clob_pair.sql → ...dx_get_perpetual_market_for_clob_pair.sql
diff --git a/.../dydx_get_total_filled_from_liquidity.sql → .../dydx_get_total_filled_from_liquidity.sql b/.../dydx_get_total_filled_from_liquidity.sql → .../dydx_get_total_filled_from_liquidity.sql
diff --git a/...src/scripts/dydx_get_weighted_average.sql → ...pts/helpers/dydx_get_weighted_average.sql b/...src/scripts/dydx_get_weighted_average.sql → ...pts/helpers/dydx_get_weighted_average.sql
diff --git a/...dx_liquidation_fill_handler_per_order.sql → ...dx_liquidation_fill_handler_per_order.sql b/...dx_liquidation_fill_handler_per_order.sql → ...dx_liquidation_fill_handler_per_order.sql
diff --git a/...pts/dydx_order_fill_handler_per_order.sql → ...ers/dydx_order_fill_handler_per_order.sql b/...pts/dydx_order_fill_handler_per_order.sql → ...ers/dydx_order_fill_handler_per_order.sql
diff --git a/...tual_position_and_order_side_matching.sql → ...tual_position_and_order_side_matching.sql b/...tual_position_and_order_side_matching.sql → ...tual_position_and_order_side_matching.sql
diff --git a/...protocol_condition_type_to_order_type.sql → ...protocol_condition_type_to_order_type.sql b/...protocol_condition_type_to_order_type.sql → ...protocol_condition_type_to_order_type.sql
diff --git a/...tendermint_event_to_transaction_index.sql → ...tendermint_event_to_transaction_index.sql b/...tendermint_event_to_transaction_index.sql → ...tendermint_event_to_transaction_index.sql
diff --git a/...ces/ender/src/scripts/dydx_trim_scale.sql → ...r/src/scripts/helpers/dydx_trim_scale.sql b/...ces/ender/src/scripts/dydx_trim_scale.sql → ...r/src/scripts/helpers/dydx_trim_scale.sql
diff --git a/...e_perpetual_position_aggregate_fields.sql → ...e_perpetual_position_aggregate_fields.sql b/...e_perpetual_position_aggregate_fields.sql → ...e_perpetual_position_aggregate_fields.sql
diff --git a/.../services/ender/src/scripts/dydx_uuid.sql → ...s/ender/src/scripts/helpers/dydx_uuid.sql b/.../services/ender/src/scripts/dydx_uuid.sql → ...s/ender/src/scripts/helpers/dydx_uuid.sql
diff --git a/...s/dydx_uuid_from_asset_position_parts.sql → ...s/dydx_uuid_from_asset_position_parts.sql b/...s/dydx_uuid_from_asset_position_parts.sql → ...s/dydx_uuid_from_asset_position_parts.sql
diff --git a/...ripts/dydx_uuid_from_fill_event_parts.sql → ...lpers/dydx_uuid_from_fill_event_parts.sql b/...ripts/dydx_uuid_from_fill_event_parts.sql → ...lpers/dydx_uuid_from_fill_event_parts.sql
diff --git a/..._uuid_from_funding_index_update_parts.sql → ..._uuid_from_funding_index_update_parts.sql b/..._uuid_from_funding_index_update_parts.sql → ..._uuid_from_funding_index_update_parts.sql
diff --git a/...pts/dydx_uuid_from_oracle_price_parts.sql → ...ers/dydx_uuid_from_oracle_price_parts.sql b/...pts/dydx_uuid_from_oracle_price_parts.sql → ...ers/dydx_uuid_from_oracle_price_parts.sql
diff --git a/...r/src/scripts/dydx_uuid_from_order_id.sql → ...ripts/helpers/dydx_uuid_from_order_id.sql b/...r/src/scripts/dydx_uuid_from_order_id.sql → ...ripts/helpers/dydx_uuid_from_order_id.sql
diff --git a/...scripts/dydx_uuid_from_order_id_parts.sql → ...helpers/dydx_uuid_from_order_id_parts.sql b/...scripts/dydx_uuid_from_order_id_parts.sql → ...helpers/dydx_uuid_from_order_id_parts.sql
diff --git a/...dx_uuid_from_perpetual_position_parts.sql → ...dx_uuid_from_perpetual_position_parts.sql b/...dx_uuid_from_perpetual_position_parts.sql → ...dx_uuid_from_perpetual_position_parts.sql
diff --git a/.../scripts/dydx_uuid_from_subaccount_id.sql → .../helpers/dydx_uuid_from_subaccount_id.sql b/.../scripts/dydx_uuid_from_subaccount_id.sql → .../helpers/dydx_uuid_from_subaccount_id.sql
diff --git a/...ts/dydx_uuid_from_subaccount_id_parts.sql → ...rs/dydx_uuid_from_subaccount_id_parts.sql b/...ts/dydx_uuid_from_subaccount_id_parts.sql → ...rs/dydx_uuid_from_subaccount_id_parts.sql
diff --git a/...ipts/dydx_uuid_from_transaction_parts.sql → ...pers/dydx_uuid_from_transaction_parts.sql b/...ipts/dydx_uuid_from_transaction_parts.sql → ...pers/dydx_uuid_from_transaction_parts.sql
diff --git a/...scripts/dydx_uuid_from_transfer_parts.sql → ...helpers/dydx_uuid_from_transfer_parts.sql b/...scripts/dydx_uuid_from_transfer_parts.sql → ...helpers/dydx_uuid_from_transfer_parts.sql