refactor: simplify configuration retrieval and enhance type safety across programs

Author: cctdaniel

governance/xc_admin/packages/xc_admin_common/src/index.ts

@@ -22,7 +22,6 @@ export {
   ProductRawConfig,
   MappingRawConfig,
   RawConfig,
-  GetConfigParams,
   DownloadablePriceAccount,
   DownloadableProduct,
   DownloadableConfig,

governance/xc_admin/packages/xc_admin_common/src/programs/core/core_functions.ts

@@ -128,9 +128,7 @@ function sortData(data: DownloadableConfig): DownloadableConfig {
 /**
  * Parse raw on-chain accounts into the Pyth Core configuration format
  */
-export function getConfig(
-  params: CoreConfigParams & { programType: ProgramType.PYTH_CORE },
-): RawConfig {
+export function getConfig(params: CoreConfigParams): RawConfig {
   const accounts = params.accounts;
 
   // Create a map of parsed base data for each account to avoid repeated parsing

governance/xc_admin/packages/xc_admin_common/src/programs/lazer/lazer_functions.ts

@@ -4,9 +4,8 @@ import {
   ValidationResult,
   DownloadableProduct,
   DownloadableConfig,
-  GetConfigParams,
+  ProgramType,
 } from "../types";
-import { ProgramType } from "../types";
 
 /**
  * Program ID for the Pyth Lazer program
@@ -81,11 +80,7 @@ export function isAvailableOnCluster(cluster: PythCluster): boolean {
  * @param params Parameters to fetch Lazer configuration
  * @returns Promise resolving to Lazer-specific configuration object
  */
-export function getConfig(
-  params: LazerConfigParams & { programType: ProgramType.PYTH_LAZER },
-): LazerConfig {
-  // No need for runtime check since it's enforced by the type system
-
+export function getConfig(params: LazerConfigParams): LazerConfig {
   // Extract the properties
   const { endpoint, network, options } = params;
 

governance/xc_admin/packages/xc_admin_common/src/programs/program_registry.ts

@@ -6,13 +6,17 @@ import {
   ProgramConfig,
   ValidationResult,
   RawConfig,
-  GetConfigParams,
 } from "./types";
 
 // Import functions from each program implementation
 import * as pythCore from "./core/core_functions";
 import * as pythLazer from "./lazer/lazer_functions";
-import { LazerConfig, LAZER_PROGRAM_ID } from "./lazer/lazer_functions";
+import {
+  LazerConfig,
+  LAZER_PROGRAM_ID,
+  LazerConfigParams,
+} from "./lazer/lazer_functions";
+import { CoreConfigParams } from "./core/core_functions";
 
 /**
  * Function to get the program address for each program type
@@ -39,18 +43,13 @@ export const isAvailableOnCluster: Record<
 
 /**
  * Function to get configuration for each program type
- * Uses discriminated union to ensure type safety
  */
 export const getConfig: {
-  [ProgramType.PYTH_CORE]: (
-    params: Extract<GetConfigParams, { programType: ProgramType.PYTH_CORE }>,
-  ) => RawConfig;
-  [ProgramType.PYTH_LAZER]: (
-    params: Extract<GetConfigParams, { programType: ProgramType.PYTH_LAZER }>,
-  ) => LazerConfig;
+  [ProgramType.PYTH_CORE]: (params: CoreConfigParams) => RawConfig;
+  [ProgramType.PYTH_LAZER]: (params: LazerConfigParams) => LazerConfig;
 } = {
-  [ProgramType.PYTH_CORE]: (params) => pythCore.getConfig(params),
-  [ProgramType.PYTH_LAZER]: (params) => pythLazer.getConfig(params),
+  [ProgramType.PYTH_CORE]: pythCore.getConfig,
+  [ProgramType.PYTH_LAZER]: pythLazer.getConfig,
 };
 
 /**

governance/xc_admin/packages/xc_admin_common/src/programs/types.ts

@@ -1,14 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { PermissionData, Product } from "@pythnetwork/client";
-import {
-  LazerConfig,
-  LazerConfigParams,
-  LazerInstructionAccounts,
-} from "./lazer/lazer_functions";
-import {
-  CoreConfigParams,
-  CoreInstructionAccounts,
-} from "./core/core_functions";
+import { LazerConfig, LazerInstructionAccounts } from "./lazer/lazer_functions";
+import { CoreInstructionAccounts } from "./core/core_functions";
 /**
  * Represents the different Pyth programs supported by the application.
  */
@@ -70,14 +63,6 @@ export type RawConfig = {
   permissionAccount?: PermissionData;
 };
 
-/**
- * Union type for configuration parameters that can vary by program type
- * This is a discriminated union type that enforces program type at compile time
- */
-export type GetConfigParams =
-  | (CoreConfigParams & { programType: ProgramType.PYTH_CORE })
-  | (LazerConfigParams & { programType: ProgramType.PYTH_LAZER });
-
 /**
  * Type for downloadable price account configuration
  */