@wireio/stake 0.1.0 → 0.1.2

package/src/networks/solana/clients/leaderboard.client.ts

@@ -1,154 +1,59 @@
-import { AnchorProvider, Program, BN } from '@coral-xyz/anchor';
-import { PublicKey, SystemProgram, Transaction, TransactionInstruction } from '@solana/web3.js';
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+
 import { SolanaProgramService } from '../program';
 import type { ValidatorLeaderboard } from '../../../assets/solana/types/validator_leaderboard';
 import {
-    deriveLeaderboardHeadPDA,
-    deriveValidatorRecordPDA,
-    deriveTop10CachePDA,
+    deriveLeaderboardStatePda,
+    deriveValidatorRecordPda,
 } from '../constants';
 
-export class ValidatorLeaderboardClient {
-    private programs: SolanaProgramService;
+/**
+ * Simple read client for the validator_leaderboard program.
+ *
+ * Adjust account names/fields to match your IDL (state, validatorRecord, etc).
+ */
+export class LeaderboardClient {
+    private program: Program<ValidatorLeaderboard>;
 
     constructor(private provider: AnchorProvider) {
-        this.programs = new SolanaProgramService(provider);
-    }
-
-    /** Anchor Program<ValidatorLeaderboard> via ProgramService */
-    private get program(): Program<ValidatorLeaderboard> {
-        return this.programs.getProgram('validatorLeaderboard') as Program<ValidatorLeaderboard>;
-    }
-
-    // ───────────────────────────────────────────────────────────────────────────────
-    // BUILDERS (return Ixs so you can batch)
-    // ───────────────────────────────────────────────────────────────────────────────
-
-    /** Initialize the leaderboard head account. */
-    async buildInitializeIx(authority: PublicKey): Promise<TransactionInstruction> {
-        const [leaderboardHead] = deriveLeaderboardHeadPDA();
-        return this.program.methods
-            .initialize()
-            .accounts({
-                authority,
-                // @ts-ignore
-                leaderboardHead,
-                systemProgram: SystemProgram.programId,
-            })
-            .instruction();
-    }
-
-    /**
-     * Upsert/update a validator record and (optionally) reposition it in the linked list.
-     * Any of insertAfter/insertBefore/currentPrev/currentNext can be omitted.
-     */
-    async buildUpdateValidatorIx(params: {
-        registrant: PublicKey;
-        voteAccount: PublicKey;
-        vpp: number; // Validator Performance Points
-        insertAfter?: PublicKey;
-        insertBefore?: PublicKey;
-        currentPrev?: PublicKey;
-        currentNext?: PublicKey;
-    }): Promise<TransactionInstruction> {
-        const { registrant, voteAccount, vpp, insertAfter, insertBefore, currentPrev, currentNext } = params;
-
-        const [leaderboardHead] = deriveLeaderboardHeadPDA();
-        const [validatorRecord] = deriveValidatorRecordPDA(voteAccount);
-
-        const accounts: any = {
-            registrant,
-            voteAccount,
-            validatorRecord,
-            leaderboardHead,
-            systemProgram: SystemProgram.programId,
-            ...(insertAfter && { insertAfter }),
-            ...(insertBefore && { insertBefore }),
-            ...(currentPrev && { currentPrev }),
-            ...(currentNext && { currentNext }),
-        };
-
-        return this.program.methods
-            .updateValidator(new BN(vpp))
-            .accounts(accounts)
-            .instruction();
-    }
-
-    /** Update the Top-10 cache. Requires exactly 10 validator vote accounts. */
-    async buildUpdateTop10CacheIx(params: {
-        authority: PublicKey;
-        top10Validators: PublicKey[];
-    }): Promise<TransactionInstruction> {
-        const { authority, top10Validators } = params;
-        if (top10Validators.length !== 10) throw new Error('Must provide exactly 10 validators');
-
-        const [cache] = deriveTop10CachePDA();
-        return this.program.methods
-            .updateTop10Cache(top10Validators)
-            .accounts({
-                // @ts-ignore
-                authority,
-                cache,
-                systemProgram: SystemProgram.programId,
-            })
-            .instruction();
-    }
-
-    // Convenience wrappers if you want a ready-to-send Transaction
-
-    async buildInitializeTx(authority: PublicKey): Promise<Transaction> {
-        return new Transaction().add(await this.buildInitializeIx(authority));
-    }
-
-    async buildUpdateValidatorTx(params: {
-        registrant: PublicKey;
-        voteAccount: PublicKey;
-        vpp: number;
-        insertAfter?: PublicKey;
-        insertBefore?: PublicKey;
-        currentPrev?: PublicKey;
-        currentNext?: PublicKey;
-    }): Promise<Transaction> {
-        return new Transaction().add(await this.buildUpdateValidatorIx(params));
-    }
-
-    async buildUpdateTop10CacheTx(params: {
-        authority: PublicKey;
-        top10Validators: PublicKey[];
-    }): Promise<Transaction> {
-        return new Transaction().add(await this.buildUpdateTop10CacheIx(params));
+        const svc = new SolanaProgramService(provider);
+        this.program = svc.getProgram('validatorLeaderboard');
     }
 
-    // ───────────────────────────────────────────────────────────────────────────────
-    // READ HELPERS
-    // ───────────────────────────────────────────────────────────────────────────────
-
-    /** Traverse the linked-list leaderboard, returning vote accounts in order. */
-    async getLeaderboard(): Promise<PublicKey[]> {
-        const [head] = deriveLeaderboardHeadPDA();
-        let headAcc;
+    async getState(): Promise<any | null> {
+        const pda = deriveLeaderboardStatePda();
         try {
-            headAcc = await this.program.account.leaderboardHead.fetch(head);
+            // Assumes account name "leaderboardState"
+            return await this.program.account.leaderboardState.fetch(pda);
         } catch {
-            return [];
-        }
-        const out: PublicKey[] = [];
-        let cursor: PublicKey = headAcc.nextValidator;
-        while (cursor && !cursor.equals(PublicKey.default)) {
-            out.push(cursor);
-            const rec = await this.program.account.validatorRecord.fetch(cursor);
-            cursor = rec.nextValidator;
+            return null;
         }
-        return out;
     }
 
-    /** Fetch a single validator record (or null if it doesn't exist). */
     async getValidatorRecord(voteAccount: PublicKey): Promise<any | null> {
-        const [recPda] = deriveValidatorRecordPDA(voteAccount);
+        const pda = deriveValidatorRecordPda(voteAccount);
         try {
-            return await this.program.account.validatorRecord.fetch(recPda);
+            // Assumes account name "validatorRecord"
+            return await this.program.account.validatorRecord.fetchNullable(pda);
         } catch {
             return null;
         }
     }
+
+    /**
+     * Convenience helper to fetch and sort top validators by score.
+     * Assumes `validatorRecord` has a numeric `score` field in the IDL.
+     */
+    async getTopValidators(limit = 20): Promise<any[]> {
+        const records = await (this.program.account as any).validatorRecord.all();
+        const sorted = (records as Array<{ publicKey: PublicKey; account: any }>).sort(
+            (a, b) => {
+                const sa = BigInt(a.account.score?.toString?.() ?? '0');
+                const sb = BigInt(b.account.score?.toString?.() ?? '0');
+                return sb > sa ? 1 : sb < sa ? -1 : 0;
+            },
+        );
+        return sorted.slice(0, limit);
+    }
 }

package/src/networks/solana/constants.ts

@@ -1,158 +1,242 @@
 // src/networks/solana/constants.ts
-import { PublicKey } from '@solana/web3.js';
-import {
-    ASSOCIATED_TOKEN_PROGRAM_ID,
-    TOKEN_2022_PROGRAM_ID,
-    getAssociatedTokenAddressSync,
-} from '@solana/spl-token';
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
-
-// IDLs (as generated artifacts)
-import DepositIDL from '../../assets/solana/idl/deposit.json';
-import StakeControllerIDL from '../../assets/solana/idl/stake_controller.json';
-import ValidatorLeaderboardIDL from '../../assets/solana/idl/validator_leaderboard.json';
-import LiqSolTokenIDL from '../../assets/solana/idl/liq_sol_token.json';
-import DistributionIDL from '../../assets/solana/idl/distribution.json';
-import YieldOracleIDL from '../../assets/solana/idl/yield_oracle.json';
-
-// Types (optional; keep the ones you use)
-import type { Deposit } from '../../assets/solana/types/deposit';
-
-// ---------- Program IDs (from IDL.address) ----------
-export const DEPOSIT_PROGRAM_ID = new PublicKey(DepositIDL.address);
-export const STAKE_CONTROLLER_PROGRAM_ID = new PublicKey(StakeControllerIDL.address);
-export const VALIDATOR_LEADERBOARD_PROGRAM_ID = new PublicKey(ValidatorLeaderboardIDL.address);
-export const LIQSOL_TOKEN_PROGRAM_ID = new PublicKey(LiqSolTokenIDL.address);
-export const DISTRIBUTION_PROGRAM_ID = new PublicKey(DistributionIDL.address);
-export const YIELD_ORACLE_PROGRAM_ID = new PublicKey(YieldOracleIDL.address);
-
-// ---------- Protocol constants ----------
-export const MIN_SOL_TO_PARTICIPATE = 1_000_000_000; // 1 SOL (lamports)
-
-// The liqSOL Mint is a PDA on the LiqSOL token program
-export const LIQSOL_MINT_ADDRESS: PublicKey = PublicKey.findProgramAddressSync(
-    [Buffer.from('liq_sol_mint')],
-    LIQSOL_TOKEN_PROGRAM_ID
-)[0];
-
-// Re-export SPL ids
-export { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID };
-
-// ---------- Program factories ----------
-/** Create Anchor Program client for the Deposit program (with correct address) */
-export const getDepositProgram = (provider: AnchorProvider): Program<Deposit> => {
-    const idlWithAddress = { ...JSON.parse(JSON.stringify(DepositIDL)), address: DEPOSIT_PROGRAM_ID.toString() };
-    return new Program(idlWithAddress as any, provider) as Program<Deposit>;
-};
-
-// You can add similar helpers for other programs if you want:
-// export const getDistributionProgram = <T>(provider: AnchorProvider) => { ... }
-
-// ---------- PDA helpers ----------
-
-// Deposit
-export const deriveDepositAuthorityPDA = (): [PublicKey, number] =>
+import { PublicKey, StakeProgram } from '@solana/web3.js';
+
+import liqsolCoreIDL from "../../assets/solana/idl/liqsol_core.json";
+import liqSolTokenIDL from "../../assets/solana/idl/liqsol_token.json";
+import validatorLeaderboardIDL from "../../assets/solana/idl/validator_leaderboard.json";
+
+/**
+ * ---------------------------------------------------------------------------
+ *  PROGRAM IDS
+ * ---------------------------------------------------------------------------
+ *
+ * These should match:
+ *  - `metadata.address` in your Anchor IDLs under src/assets/solana/idl/*.json
+ *  - The program IDs printed by your deploy scripts
+ */
+// Extract program IDs from IDL files
+export const PROGRAM_IDS = {
+    LIQSOL_CORE: new PublicKey(liqsolCoreIDL.address),
+    LIQSOL_TOKEN: new PublicKey(liqSolTokenIDL.address),
+    VALIDATOR_LEADERBOARD: new PublicKey(validatorLeaderboardIDL.address),
+} as const;
+
+// Export individual program IDs for convenience
+export const {
+    LIQSOL_CORE,
+    LIQSOL_TOKEN,
+    VALIDATOR_LEADERBOARD,
+} = PROGRAM_IDS;
+
+/**
+ * ---------------------------------------------------------------------------
+ *  PDA SEEDS (must match on-chain programs)
+ * ---------------------------------------------------------------------------
+ *
+ * These strings are baked into the on-chain programs and are already used in
+ * your test utils. We centralize them here so all clients share them.
+ */
+
+export const PDA_SEEDS = {
+    // liqsol_core: deposit / stake controller
+    DEPOSIT_AUTHORITY: 'deposit_authority',
+    VAULT: 'vault',
+    RESERVE_POOL: 'reserve_pool',
+    STAKE_CONTROLLER_STATE: 'stake_controller',
+    PAYOUT_STATE: 'payout-state',
+
+    // liqsol_token: mint + bucket
+    LIQSOL_MINT: 'liqsol_mint',
+    LIQSOL_MINT_AUTHORITY: 'mint_authority',
+    BUCKET_AUTHORITY: 'liqsol_bucket',
+
+    // distribution program (embedded in liqsol_core)
+    DISTRIBUTION_STATE: 'distribution_state',
+    USER_RECORD: 'user_record',
+
+    // pay-rate history
+    PAY_RATE_HISTORY: 'pay_rate_history',
+
+    // validator leaderboard (state + records)
+    LEADERBOARD_STATE: 'leaderboard_state',
+    VALIDATOR_RECORD: 'validator',
+    GLOBAL_STAKE_INFO: 'global_stake_info',
+} as const;
+
+/**
+ * Helpers for PDA derivation so clients don’t duplicate logic.
+ */
+
+export const deriveLiqsolMintPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('program_authority')], 
-        DEPOSIT_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.LIQSOL_MINT)],
+        PROGRAM_IDS.LIQSOL_TOKEN,
+    )[0];
 
-// LiqSOL Token program
-export const deriveLiqsolMintPDA = (): [PublicKey, number] =>
+export const deriveLiqsolMintAuthorityPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('liq_sol_mint')], 
-        LIQSOL_TOKEN_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.LIQSOL_MINT_AUTHORITY)],
+        PROGRAM_IDS.LIQSOL_TOKEN,
+    )[0];
 
-/** ✅ FIXED: this must be derived with the LiqSOL token **program id**, not the mint address */
-export const deriveLiqsolMintAuthorityPDA = (): [PublicKey, number] =>
+export const deriveDepositAuthorityPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('mint_authority')], 
-        LIQSOL_TOKEN_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.DEPOSIT_AUTHORITY)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-// Stake Controller
-export const deriveStakeControllerVaultPDA = (): [PublicKey, number] =>
+export const deriveVaultPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('vault')], 
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.VAULT)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-export const deriveStakeControllerReservePoolPDA = (): [PublicKey, number] =>
+export const deriveReservePoolPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('reserve_pool')], 
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.RESERVE_POOL)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-export const deriveStakeControllerStatePDA = (): [PublicKey, number] =>
+export const deriveStakeControllerStatePda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('stake_controller')], 
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.STAKE_CONTROLLER_STATE)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-export const deriveGlobalStakeInfoPDA = (): [PublicKey, number] =>
+export const derivePayoutStatePda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('global_stake_info')], 
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.PAYOUT_STATE)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-export const deriveBucketAuthorityPDA = (): [PublicKey, number] =>
+export const deriveBucketAuthorityPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('liqsol_bucket')], 
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.BUCKET_AUTHORITY)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-export const derivePayRateHistoryPDA = (): [PublicKey, number] =>
+export const deriveDistributionStatePda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('pay_rate_history')], 
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.DISTRIBUTION_STATE)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-// Distribution
-export const deriveDistributionStatePDA = (): [PublicKey, number] =>
+export const deriveUserRecordPda = (user: PublicKey) =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('distribution_state')], 
-        DISTRIBUTION_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.USER_RECORD), user.toBuffer()],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-export const deriveUserRecordPDA = (user: PublicKey): [PublicKey, number] =>
+export const derivePayRateHistoryPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('user_record'), user.toBuffer()], 
-        DISTRIBUTION_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.PAY_RATE_HISTORY)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
 
-// Validator Leaderboard
-export const deriveLeaderboardHeadPDA = (): [PublicKey, number] =>
-    PublicKey.findProgramAddressSync(
-        [Buffer.from('leaderboard_head')], 
-        VALIDATOR_LEADERBOARD_PROGRAM_ID
-    );
+// export const deriveGlobalStakeInfoPda = () =>
+//     PublicKey.findProgramAddressSync(
+//         [Buffer.from(PDA_SEEDS.GLOBAL_STAKE_INFO)],
+//         PROGRAM_IDS.LIQSOL_CORE,
+//     )[0];
 
-export const deriveValidatorRecordPDA = (voteAccount: PublicKey): [PublicKey, number] =>
+export const deriveLeaderboardStatePda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('validator_record'), voteAccount.toBuffer()], 
-        VALIDATOR_LEADERBOARD_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.LEADERBOARD_STATE)],
+        PROGRAM_IDS.VALIDATOR_LEADERBOARD,
+    )[0];
 
-export const deriveTop10CachePDA = (): [PublicKey, number] =>
+export const deriveValidatorRecordPda = (voteAccount: PublicKey) =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('top_10_cache')], 
-        VALIDATOR_LEADERBOARD_PROGRAM_ID
-    );
-
-export const deriveStakeControllerAuthorityPDA = (): [PublicKey, number] =>
+        [Buffer.from(PDA_SEEDS.VALIDATOR_RECORD), voteAccount.toBuffer()],
+        PROGRAM_IDS.VALIDATOR_LEADERBOARD,
+    )[0];
+
+/**
+* Stake controller vault PDA (reserve pool SOL vault).
+* This is the same as VAULT, but named more explicitly for SDK callers.
+*/
+export const deriveStakeControllerVaultPda = () =>
     PublicKey.findProgramAddressSync(
-        [Buffer.from('stake_authority')],
-        STAKE_CONTROLLER_PROGRAM_ID
-    );
-
-// ---------- SPL helper ----------
-/** User’s liqSOL ATA (Token-2022) */
-export const getUserLiqsolATA = (user: PublicKey): PublicKey =>
-    getAssociatedTokenAddressSync(
-        LIQSOL_MINT_ADDRESS,
-        user,
-    /* owner is PDA? */ false,
-        TOKEN_2022_PROGRAM_ID,
-        ASSOCIATED_TOKEN_PROGRAM_ID
-    );
+        [Buffer.from(PDA_SEEDS.VAULT)],
+        PROGRAM_IDS.LIQSOL_CORE,
+    )[0];
+
+/**
+ * Ephemeral stake account address used per-deposit.
+ * On-chain convention: seed = `ephemeral_<u32>` under StakeProgram.programId.
+ */
+export const deriveEphemeralStakeAddress = async (
+    user: PublicKey,
+    seed: any,
+): Promise<PublicKey> => {
+    const seedStr = `ephemeral_${seed}`;
+    return await PublicKey.createWithSeed(user, seedStr, StakeProgram.programId);
+};
+
+
+
+/**
+ * ---------------------------------------------------------------------------
+ *  ECONOMICS & MATH CONSTANTS
+ * ---------------------------------------------------------------------------
+ */
+
+// Same scale factor used on-chain for pay-rate math
+export const PAY_RATE_SCALE_FACTOR = BigInt(1_000_000_000_000); // 10^12
+
+// Default pay rate fallback used in tests & utils
+export const DEFAULT_AVERAGE_PAY_RATE = BigInt(191_780_821);
+
+// How many history entries to average when computing expected fee
+export const DEFAULT_PAY_RATE_LOOKBACK = 5;
+
+// Rent exemption for ephemeral stake account (lamports)
+// Mirrors EPHEMERAL_RENT_EXEMPTION = 2_282_880 used in tests
+export const EPHEMERAL_RENT_EXEMPTION = 2_282_880;
+
+// For convenience: lamports <-> SOL helpers (no RPC dependency)
+export const LAMPORTS_PER_SOL = 1_000_000_000;
+
+export const lamportsToSol = (lamports: number | bigint): number =>
+    Number(lamports) / LAMPORTS_PER_SOL;
+
+export const solToLamports = (sol: number): number =>
+    Math.round(sol * LAMPORTS_PER_SOL);
+
+/**
+ * ---------------------------------------------------------------------------
+ *  CLUSTER / ENVIRONMENT CONFIG (optional but handy)
+ * ---------------------------------------------------------------------------
+ */
+
+export type SolanaCluster = 'localnet' | 'devnet' | 'mainnet';
+
+// export interface SolanaStakeProgramAddresses {
+//     liqsolCore: PublicKey;
+//     liqsolToken: PublicKey;
+//     validatorLeaderboard: PublicKey;
+// }
+
+// export const PROGRAMS_BY_CLUSTER: Record<SolanaCluster, SolanaStakeProgramAddresses> = {
+//     localnet: {
+//         liqsolCore: PROGRAM_IDS.LIQSOL_CORE,
+//         liqsolToken: PROGRAM_IDS.LIQSOL_TOKEN,
+//         validatorLeaderboard: PROGRAM_IDS.VALIDATOR_LEADERBOARD,
+//     },
+//     devnet: {
+//         liqsolCore: PROGRAM_IDS.LIQSOL_CORE,
+//         liqsolToken: PROGRAM_IDS.LIQSOL_TOKEN,
+//         validatorLeaderboard: PROGRAM_IDS.VALIDATOR_LEADERBOARD,
+//     },
+//     mainnet: {
+//         liqsolCore: PROGRAM_IDS.LIQSOL_CORE,
+//         liqsolToken: PROGRAM_IDS.LIQSOL_TOKEN,
+//         validatorLeaderboard: PROGRAM_IDS.VALIDATOR_LEADERBOARD,
+//     },
+// };
+
+// export const DEFAULT_CLUSTER: SolanaCluster = 'localnet';
+
+// export function getProgramIds(cluster: SolanaCluster = DEFAULT_CLUSTER): SolanaStakeProgramAddresses {
+//     return PROGRAMS_BY_CLUSTER[cluster];
+// }

package/src/networks/solana/program.ts

@@ -1,60 +1,47 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
-import depositJson from '../../assets/solana/idl/deposit.json';
-import stakeControllerJson from '../../assets/solana/idl/stake_controller.json';
-import liqSolTokenJson from '../../assets/solana/idl/liq_sol_token.json';
-import distributionJson from '../../assets/solana/idl/distribution.json';
+
+import liqsolCoreJson from '../../assets/solana/idl/liqsol_core.json';
+import liqsolTokenJson from '../../assets/solana/idl/liqsol_token.json';
 import validatorLeaderboardJson from '../../assets/solana/idl/validator_leaderboard.json';
 
-import type { Deposit } from '../../assets/solana/types/deposit';
-import type { StakeController } from '../../assets/solana/types/stake_controller';
-import type { LiqSolToken } from '../../assets/solana/types/liq_sol_token';
-import type { Distribution } from '../../assets/solana/types/distribution';
+import type { LiqsolCore } from '../../assets/solana/types/liqsol_core';
+import type { LiqsolToken } from '../../assets/solana/types/liqsol_token';
 import type { ValidatorLeaderboard } from '../../assets/solana/types/validator_leaderboard';
 
-import {
-    DEPOSIT_PROGRAM_ID,
-    STAKE_CONTROLLER_PROGRAM_ID,
-    LIQSOL_TOKEN_PROGRAM_ID,
-    DISTRIBUTION_PROGRAM_ID,
-    VALIDATOR_LEADERBOARD_PROGRAM_ID
-} from '../solana/constants';
+import { PROGRAM_IDS } from './constants';
 
-type Entry<IDL> = { idl: IDL & { address: string }, address: string };
+type Entry<IDL> = {
+    idl: IDL & { address: string };
+    address: string;
+};
 
 const PROGRAMS = {
-    deposit: {
-        idl: depositJson,
-        address: DEPOSIT_PROGRAM_ID.toBase58()
-    } as Entry<Deposit>,
-    stakeController: {
-        idl: stakeControllerJson,
-        address: STAKE_CONTROLLER_PROGRAM_ID.toBase58()
-    } as Entry<StakeController>,
-    liqSolToken: {
-        idl: liqSolTokenJson,
-        address: LIQSOL_TOKEN_PROGRAM_ID.toBase58()
-    } as Entry<LiqSolToken>,
-    distribution: {
-        idl: distributionJson,
-        address: DISTRIBUTION_PROGRAM_ID.toBase58()
-    } as Entry<Distribution>,
+    liqsolCore: {
+        idl: liqsolCoreJson,
+        address: PROGRAM_IDS.LIQSOL_CORE.toBase58(),
+    } as Entry<LiqsolCore>,
+    liqsolToken: {
+        idl: liqsolTokenJson,
+        address: PROGRAM_IDS.LIQSOL_TOKEN.toBase58(),
+    } as Entry<LiqsolToken>,
     validatorLeaderboard: {
         idl: validatorLeaderboardJson,
-        address:VALIDATOR_LEADERBOARD_PROGRAM_ID.toBase58()
+        address: PROGRAM_IDS.VALIDATOR_LEADERBOARD.toBase58(),
     } as Entry<ValidatorLeaderboard>,
 } as const;
 
+export type SolanaProgramName = keyof typeof PROGRAMS;
+
 export class SolanaProgramService {
     constructor(private provider: AnchorProvider) { }
 
-    getProgram<K extends keyof typeof PROGRAMS>(name: K): Program<(typeof PROGRAMS)[K]['idl']> {
+    getProgram<K extends SolanaProgramName>(name: K): Program<(typeof PROGRAMS)[K]['idl']> {
         const { idl, address } = PROGRAMS[name];
-        // Ensure the IDL has the right address (avoid drift)
         const idlWithAddr = { ...idl, address };
-        return new Program(idlWithAddr as any, this.provider) as Program<(typeof PROGRAMS)[K]['idl']>;
+        return new Program(idlWithAddr, this.provider) as Program<(typeof PROGRAMS)[K]['idl']>;
     }
 
-    listProgramNames(): Array<keyof typeof PROGRAMS> {
-        return Object.keys(PROGRAMS) as Array<keyof typeof PROGRAMS>;
+    listProgramNames(): SolanaProgramName[] {
+        return Object.keys(PROGRAMS) as SolanaProgramName[];
     }
 }