- expose fee fetchers for default and whitelisted states

streamflow-finance · Oct 8, 2024 · df89b5d · df89b5d
1 parent 6255290
commit df89b5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/staking/solana/client.ts b/packages/staking/solana/client.ts
@@ -41,6 +41,7 @@ import {
   CreateRewardEntryArgs,
   CreateRewardPoolArgs,
   CreateStakePoolArgs,
+  DefaultFeeValueConfig,
   FeeValue,
   FundPoolArgs,
   IInteractSolanaExt,
@@ -166,18 +167,18 @@ export class SolanaStakingClient {
     return rewardPoolProgram.account.rewardEntry.all(getFilters(criteria, REWARD_ENTRY_BYTE_OFFSETS));
   }
 
-  async getFee(target: string | PublicKey): Promise<FeeValue> {
+  async getFee(target: string | PublicKey): Promise<FeeValue | DefaultFeeValueConfig> {
     const perTargetFee = await this.getFeeValueIfExists(target);
     if (perTargetFee) {
       return perTargetFee;
     }
     return this.getDefaultFeeValue();
   }
 
-  getDefaultFeeValue(): Promise<FeeValue> {
+  getDefaultFeeValue(): Promise<DefaultFeeValueConfig> {
     const { feeManagerProgram } = this.programs;
     const feeValueKey = deriveConfigPDA(feeManagerProgram.programId);
-    return feeManagerProgram.account.feeValue.fetch(feeValueKey);
+    return feeManagerProgram.account.config.fetch(feeValueKey);
   }
 
   getFeeValueIfExists(target: string | PublicKey): Promise<FeeValue | null> {

diff --git a/packages/staking/solana/types.ts b/packages/staking/solana/types.ts
@@ -13,6 +13,7 @@ export type StakeEntry = IdlTypes<StakePoolIDL>["stakeEntry"];
 export type RewardEntry = IdlTypes<RewardPoolIDL>["rewardEntry"];
 export type RewardPool = IdlTypes<RewardPoolIDL>["rewardPool"];
 export type FeeValue = IdlTypes<FeeManagerIDL>["feeValue"];
+export type DefaultFeeValueConfig = IdlTypes<FeeManagerIDL>["config"];
 
 export interface IInteractSolanaExt extends ITransactionSolanaExt {
   invoker: SignerWalletAdapter | Keypair;