@streamflow/staking 7.0.0-alpha.10 → 7.0.0-alpha.13

package/dist/esm/solana/client.d.ts

@@ -6,7 +6,7 @@ import { REWARD_ENTRY_BYTE_OFFSETS, STAKE_ENTRY_BYTE_OFFSETS, STAKE_POOL_BYTE_OF
 import { FeeManager as FeeManagerProgramType } from "./descriptor/fee_manager.js";
 import { RewardPool as RewardPoolProgramType } from "./descriptor/reward_pool.js";
 import { StakePool as StakePoolProgramType } from "./descriptor/stake_pool.js";
-import { ClaimRewardPoolArgs, CreateRewardEntryArgs, CreateRewardPoolArgs, CreateStakePoolArgs, FeeValue, FundPoolArgs, IInteractSolanaExt, RewardEntry, RewardPool, StakeArgs, StakeEntry, StakePool, UnstakeArgs } from "./types.js";
+import { ClaimRewardPoolArgs, CreateRewardEntryArgs, CreateRewardPoolArgs, CreateStakePoolArgs, DefaultFeeValueConfig, FeeValue, FundPoolArgs, IInteractSolanaExt, RewardEntry, RewardPool, StakeArgs, StakeEntry, StakePool, UnstakeArgs } from "./types.js";
 interface Programs {
     stakePoolProgram: Program<StakePoolProgramType>;
     rewardPoolProgram: Program<RewardPoolProgramType>;
@@ -27,7 +27,7 @@ interface IInitOptions {
     sendRate?: number;
     sendThrottler?: PQueue;
 }
-export default class SolanaStakingClient {
+export declare class SolanaStakingClient {
     connection: Connection;
     private commitment;
     private sendThrottler;
@@ -41,6 +41,8 @@ export default class SolanaStakingClient {
     searchStakeEntries(criteria?: Partial<Pick<StakeEntry, keyof typeof STAKE_ENTRY_BYTE_OFFSETS>>): Promise<ProgramAccount<StakeEntry>[]>;
     searchRewardPools(criteria?: Partial<Pick<RewardPool, "stakePool" | "mint">>): Promise<ProgramAccount<RewardPool>[]>;
     searchRewardEntries(criteria: Partial<Pick<RewardEntry, keyof typeof REWARD_ENTRY_BYTE_OFFSETS>>): Promise<ProgramAccount<RewardEntry>[]>;
+    getFee(target: string | PublicKey): Promise<FeeValue | DefaultFeeValueConfig>;
+    getDefaultFeeValue(): Promise<DefaultFeeValueConfig>;
     getFeeValueIfExists(target: string | PublicKey): Promise<FeeValue | null>;
     createStakePool(data: CreateStakePoolArgs, extParams: IInteractSolanaExt): Promise<CreationResult>;
     prepareCreateStakePoolInstructions({ maxWeight, maxDuration, minDuration, mint, permissionless, nonce, tokenProgramId, }: CreateStakePoolArgs, extParams: IInteractSolanaExt): Promise<{

package/dist/esm/solana/client.js

@@ -1,14 +1,14 @@
-import { Program, parseIdlErrors, translateError, } from "@coral-xyz/anchor";
+import { Program, parseIdlErrors, translateError } from "@coral-xyz/anchor";
 import { TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from "@solana/spl-token";
-import { Connection, PublicKey, } from "@solana/web3.js";
-import { ContractError, ICluster } from "@streamflow/common";
-import { buildSendThrottler, checkOrCreateAtaBatch, prepareTransaction, signAndExecuteTransaction, } from "@streamflow/common/solana";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { ContractError, ICluster, invariant } from "@streamflow/common";
+import { buildSendThrottler, checkOrCreateAtaBatch, getFilters, pk, prepareTransaction, signAndExecuteTransaction, } from "@streamflow/common/solana";
 import { REWARD_ENTRY_BYTE_OFFSETS, REWARD_POOL_BYTE_OFFSETS, REWARD_POOL_PROGRAM_ID, STAKE_ENTRY_BYTE_OFFSETS, STAKE_POOL_BYTE_OFFSETS, STAKE_POOL_PROGRAM_ID, STREAMFLOW_TREASURY_PUBLIC_KEY, } from "./constants.js";
 import FeeManagerIDL from "./descriptor/idl/fee_manager.json";
 import RewardPoolIDL from "./descriptor/idl/reward_pool.json";
 import StakePoolIDL from "./descriptor/idl/stake_pool.json";
-import { deriveFeeValuePDA, deriveRewardPoolPDA, deriveRewardVaultPDA, deriveStakeEntryPDA, deriveStakeMintPDA, deriveStakePoolPDA, } from "./lib/derive-accounts.js";
-export default class SolanaStakingClient {
+import { deriveConfigPDA, deriveFeeValuePDA, deriveRewardPoolPDA, deriveRewardVaultPDA, deriveStakeEntryPDA, deriveStakeMintPDA, deriveStakePoolPDA, } from "./lib/derive-accounts.js";
+export class SolanaStakingClient {
     connection;
     commitment;
     sendThrottler;
@@ -73,6 +73,18 @@ export default class SolanaStakingClient {
         const { rewardPoolProgram } = this.programs;
         return rewardPoolProgram.account.rewardEntry.all(getFilters(criteria, REWARD_ENTRY_BYTE_OFFSETS));
     }
+    async getFee(target) {
+        const perTargetFee = await this.getFeeValueIfExists(target);
+        if (perTargetFee) {
+            return perTargetFee;
+        }
+        return this.getDefaultFeeValue();
+    }
+    getDefaultFeeValue() {
+        const { feeManagerProgram } = this.programs;
+        const feeValueKey = deriveConfigPDA(feeManagerProgram.programId);
+        return feeManagerProgram.account.config.fetch(feeValueKey);
+    }
     getFeeValueIfExists(target) {
         const { feeManagerProgram } = this.programs;
         const feeValueKey = deriveFeeValuePDA(feeManagerProgram.programId, new PublicKey(target));
@@ -284,30 +296,3 @@ export default class SolanaStakingClient {
         }
     }
 }
-function pk(address) {
-    return typeof address === "string" ? new PublicKey(address) : address;
-}
-const prefix = "Assertion failed";
-function invariant(condition, message) {
-    if (condition) {
-        return;
-    }
-    const provided = typeof message === "function" ? message() : message;
-    const value = provided ? `${prefix}: ${provided}` : prefix;
-    throw new Error(value);
-}
-function getFilters(criteria, byteOffsets) {
-    return Object.entries(criteria).reduce((acc, [key, value]) => {
-        const criteriaKey = key;
-        const effectiveByteOffset = byteOffsets[criteriaKey];
-        if (criteria[criteriaKey] && effectiveByteOffset) {
-            acc.push({
-                memcmp: {
-                    offset: effectiveByteOffset,
-                    bytes: value.toString(),
-                },
-            });
-        }
-        return acc;
-    }, []);
-}

package/dist/esm/solana/constants.d.ts

@@ -48,3 +48,4 @@ export declare const REWARD_ENTRY_BYTE_OFFSETS: {
 };
 export declare const STAKE_POOL_PROGRAM_ID: Record<ICluster, string>;
 export declare const REWARD_POOL_PROGRAM_ID: Record<ICluster, string>;
+export declare const FEE_PROGRAM_ID: Record<ICluster, string>;

package/dist/esm/solana/constants.js

@@ -56,3 +56,9 @@ export const REWARD_POOL_PROGRAM_ID = {
     [ICluster.Testnet]: "RWRDdfRbi3339VgKxTAXg4cjyniF7cbhNbMxZWiSKmj",
     [ICluster.Local]: "RWRDdfRbi3339VgKxTAXg4cjyniF7cbhNbMxZWiSKmj",
 };
+export const FEE_PROGRAM_ID = {
+    [ICluster.Mainnet]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+    [ICluster.Devnet]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+    [ICluster.Testnet]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+    [ICluster.Local]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+};

package/dist/esm/solana/descriptor/idl/reward_pool.json

@@ -338,8 +338,8 @@
                         "program": {
                             "kind": "const",
                             "value": [
-                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142, 13, 131, 11, 90, 19, 153, 218,
-                                255, 16, 132, 4, 142, 123, 216, 219, 233, 248, 89
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142, 13, 131, 11, 90, 19, 153, 218, 255, 16,
+                                132, 4, 142, 123, 216, 219, 233, 248, 89
                             ]
                         }
                     }
@@ -778,9 +778,7 @@
                     },
                     {
                         "name": "effective_amount",
-                        "docs": [
-                            "Effective Amount staked, does not equal to deposited amount, accounts for Stake Weight"
-                        ],
+                        "docs": ["Effective Amount staked, does not equal to deposited amount, accounts for Stake Weight"],
                         "type": "u128"
                     },
                     {