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

package/dist/cjs/index.js

@@ -25,15 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constants = exports.SolanaStakingClient = void 0;
 var client_js_1 = require("./solana/client.js");
-Object.defineProperty(exports, "SolanaStakingClient", { enumerable: true, get: function () { return __importDefault(client_js_1).default; } });
-__exportStar(require("./solana/utils.js"), exports);
+Object.defineProperty(exports, "SolanaStakingClient", { enumerable: true, get: function () { return client_js_1.SolanaStakingClient; } });
 __exportStar(require("./solana/types.js"), exports);
 __exportStar(require("./solana/lib/derive-accounts.js"), exports);
 __exportStar(require("./solana/lib/rewards.js"), exports);
+__exportStar(require("./solana/lib/fee-amounts.js"), exports);
+__exportStar(require("./solana/lib/stake-weight.js"), exports);
 exports.constants = __importStar(require("./solana/constants.js"));

package/dist/cjs/solana/client.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaStakingClient = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
@@ -44,7 +45,7 @@ class SolanaStakingClient {
     }
     getCurrentProgramId(programKey) {
         const program = this.programs[programKey];
-        invariant(program, `Program ${programKey} is not found`);
+        (0, common_1.invariant)(program, `Program ${programKey} is not found`);
         return program.programId;
     }
     getCommitment() {
@@ -56,7 +57,7 @@ class SolanaStakingClient {
     }
     async searchStakePools(criteria = {}) {
         const { stakePoolProgram } = this.programs;
-        return stakePoolProgram.account.stakePool.all(getFilters(criteria, constants_js_1.STAKE_POOL_BYTE_OFFSETS));
+        return stakePoolProgram.account.stakePool.all((0, solana_1.getFilters)(criteria, constants_js_1.STAKE_POOL_BYTE_OFFSETS));
     }
     async getStakeEntry(id) {
         const { stakePoolProgram } = this.programs;
@@ -64,15 +65,27 @@ class SolanaStakingClient {
     }
     async searchStakeEntries(criteria = {}) {
         const { stakePoolProgram } = this.programs;
-        return stakePoolProgram.account.stakeEntry.all(getFilters(criteria, constants_js_1.STAKE_ENTRY_BYTE_OFFSETS));
+        return stakePoolProgram.account.stakeEntry.all((0, solana_1.getFilters)(criteria, constants_js_1.STAKE_ENTRY_BYTE_OFFSETS));
     }
     async searchRewardPools(criteria = {}) {
         const { rewardPoolProgram } = this.programs;
-        return rewardPoolProgram.account.rewardPool.all(getFilters(criteria, constants_js_1.REWARD_POOL_BYTE_OFFSETS));
+        return rewardPoolProgram.account.rewardPool.all((0, solana_1.getFilters)(criteria, constants_js_1.REWARD_POOL_BYTE_OFFSETS));
     }
     async searchRewardEntries(criteria) {
         const { rewardPoolProgram } = this.programs;
-        return rewardPoolProgram.account.rewardEntry.all(getFilters(criteria, constants_js_1.REWARD_ENTRY_BYTE_OFFSETS));
+        return rewardPoolProgram.account.rewardEntry.all((0, solana_1.getFilters)(criteria, constants_js_1.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 = (0, derive_accounts_js_1.deriveConfigPDA)(feeManagerProgram.programId);
+        return feeManagerProgram.account.config.fetch(feeValueKey);
     }
     getFeeValueIfExists(target) {
         const { feeManagerProgram } = this.programs;
@@ -91,7 +104,7 @@ class SolanaStakingClient {
     async prepareCreateStakePoolInstructions({ maxWeight, maxDuration, minDuration, mint, permissionless = false, nonce, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID, }, extParams) {
         const { stakePoolProgram } = this.programs;
         const creator = extParams.invoker.publicKey;
-        invariant(creator, "Undefined invoker publicKey");
+        (0, common_1.invariant)(creator, "Undefined invoker publicKey");
         const createInstruction = await stakePoolProgram.methods
             .createPool(nonce, maxWeight, minDuration, maxDuration, permissionless)
             .accounts({
@@ -100,7 +113,7 @@ class SolanaStakingClient {
             tokenProgram: tokenProgramId,
         })
             .instruction();
-        const stakePoolPDA = (0, derive_accounts_js_1.deriveStakePoolPDA)(stakePoolProgram.programId, pk(mint), creator, nonce);
+        const stakePoolPDA = (0, derive_accounts_js_1.deriveStakePoolPDA)(stakePoolProgram.programId, (0, solana_1.pk)(mint), creator, nonce);
         return { ixs: [createInstruction], publicKey: stakePoolPDA };
     }
     async stake(data, extParams) {
@@ -114,10 +127,10 @@ class SolanaStakingClient {
     async prepareStakeInstructions({ nonce, amount, duration, stakePool, stakePoolMint, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID }, extParams) {
         const { stakePoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
-        invariant(staker, "Undefined invoker publicKey");
-        const mint = (0, derive_accounts_js_1.deriveStakeMintPDA)(stakePoolProgram.programId, pk(stakePool));
-        const stakeMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, staker, false, pk(tokenProgramId));
-        const poolMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(pk(stakePoolMint), staker, false, pk(tokenProgramId));
+        (0, common_1.invariant)(staker, "Undefined invoker publicKey");
+        const mint = (0, derive_accounts_js_1.deriveStakeMintPDA)(stakePoolProgram.programId, (0, solana_1.pk)(stakePool));
+        const stakeMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, staker, false, (0, solana_1.pk)(tokenProgramId));
+        const poolMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)((0, solana_1.pk)(stakePoolMint), staker, false, (0, solana_1.pk)(tokenProgramId));
         const instruction = await stakePoolProgram.methods
             .stake(nonce, amount, duration)
             .accounts({
@@ -142,11 +155,11 @@ class SolanaStakingClient {
     async prepareUnstakeInstructions({ stakePool, stakePoolMint, nonce, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID }, extParams) {
         const { stakePoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
-        invariant(staker, "Undefined invoker publicKey");
-        const stakeMintKey = (0, derive_accounts_js_1.deriveStakeMintPDA)(stakePoolProgram.programId, pk(stakePool));
-        const stakeEntryKey = (0, derive_accounts_js_1.deriveStakeEntryPDA)(stakePoolProgram.programId, pk(stakePool), staker, nonce);
-        const poolMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(pk(stakePoolMint), staker, false, pk(tokenProgramId));
-        const stakeMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(stakeMintKey, staker, false, pk(tokenProgramId));
+        (0, common_1.invariant)(staker, "Undefined invoker publicKey");
+        const stakeMintKey = (0, derive_accounts_js_1.deriveStakeMintPDA)(stakePoolProgram.programId, (0, solana_1.pk)(stakePool));
+        const stakeEntryKey = (0, derive_accounts_js_1.deriveStakeEntryPDA)(stakePoolProgram.programId, (0, solana_1.pk)(stakePool), staker, nonce);
+        const poolMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)((0, solana_1.pk)(stakePoolMint), staker, false, (0, solana_1.pk)(tokenProgramId));
+        const stakeMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(stakeMintKey, staker, false, (0, solana_1.pk)(tokenProgramId));
         const instruction = await stakePoolProgram.methods
             .unstake()
             .accounts({
@@ -171,7 +184,7 @@ class SolanaStakingClient {
     async prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless = false, stakePool, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID, }, extParams) {
         const { rewardPoolProgram } = this.programs;
         const creator = extParams.invoker.publicKey;
-        invariant(creator, "Undefined invoker publicKey");
+        (0, common_1.invariant)(creator, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
             .createPool(nonce, rewardAmount, rewardPeriod, permissionless)
             .accounts({
@@ -181,7 +194,7 @@ class SolanaStakingClient {
             tokenProgram: tokenProgramId,
         })
             .instruction();
-        const rewardPoolKey = (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, pk(stakePool), pk(rewardMint), nonce);
+        const rewardPoolKey = (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, (0, solana_1.pk)(stakePool), (0, solana_1.pk)(rewardMint), nonce);
         return { publicKey: rewardPoolKey, ixs: [instruction] };
     }
     async claimRewards(data, extParams) {
@@ -195,15 +208,15 @@ class SolanaStakingClient {
     async prepareClaimRewardsInstructions({ rewardPoolNonce, depositNonce, stakePool, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID, rewardMint }, extParams) {
         const { stakePoolProgram, rewardPoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
-        invariant(staker, "Undefined invoker publicKey");
+        (0, common_1.invariant)(staker, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
             .claimRewards()
             .accounts({
-            stakeEntry: (0, derive_accounts_js_1.deriveStakeEntryPDA)(stakePoolProgram.programId, pk(stakePool), staker, depositNonce),
-            rewardPool: (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, pk(stakePool), pk(rewardMint), rewardPoolNonce),
+            stakeEntry: (0, derive_accounts_js_1.deriveStakeEntryPDA)(stakePoolProgram.programId, (0, solana_1.pk)(stakePool), staker, depositNonce),
+            rewardPool: (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, (0, solana_1.pk)(stakePool), (0, solana_1.pk)(rewardMint), rewardPoolNonce),
             claimant: staker,
             tokenProgram: tokenProgramId,
-            to: (0, spl_token_1.getAssociatedTokenAddressSync)(pk(rewardMint), staker, false, pk(tokenProgramId)),
+            to: (0, spl_token_1.getAssociatedTokenAddressSync)((0, solana_1.pk)(rewardMint), staker, false, (0, solana_1.pk)(tokenProgramId)),
         })
             .instruction();
         return { ixs: [instruction] };
@@ -219,14 +232,14 @@ class SolanaStakingClient {
     async prepareFundPoolInstructions({ amount, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID, rewardMint, stakePool, feeValue, nonce }, extParams) {
         const { rewardPoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
-        invariant(staker, "Undefined invoker publicKey");
+        (0, common_1.invariant)(staker, "Undefined invoker publicKey");
         const existingFee = await this.getFeeValueIfExists(staker);
-        const rewardMintPk = pk(rewardMint);
-        const tokenProgramPk = pk(tokenProgramId);
+        const rewardMintPk = (0, solana_1.pk)(rewardMint);
+        const tokenProgramPk = (0, solana_1.pk)(tokenProgramId);
         const treasuryATA = !existingFee || existingFee.streamflowFee.gtn(0)
             ? await (0, solana_1.checkOrCreateAtaBatch)(this.connection, [constants_js_1.STREAMFLOW_TREASURY_PUBLIC_KEY], rewardMintPk, extParams.invoker, tokenProgramPk)
             : null;
-        const rewardPoolPda = (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, pk(stakePool), rewardMintPk, nonce);
+        const rewardPoolPda = (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, (0, solana_1.pk)(stakePool), rewardMintPk, nonce);
         const instruction = await rewardPoolProgram.methods
             .fundPool(amount)
             .accountsPartial({
@@ -252,14 +265,14 @@ class SolanaStakingClient {
     async prepareCreateRewardEntryInstructions({ stakePoolMint, stakePool, rewardPoolNonce, depositNonce }, extParams) {
         const { stakePoolProgram, rewardPoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
-        invariant(staker, "Undefined invoker publicKey");
+        (0, common_1.invariant)(staker, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
             .createEntry()
             .accounts({
             payer: staker,
             authority: staker,
-            stakeEntry: (0, derive_accounts_js_1.deriveStakeEntryPDA)(stakePoolProgram.programId, pk(stakePool), staker, depositNonce),
-            rewardPool: (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, pk(stakePool), pk(stakePoolMint), rewardPoolNonce),
+            stakeEntry: (0, derive_accounts_js_1.deriveStakeEntryPDA)(stakePoolProgram.programId, (0, solana_1.pk)(stakePool), staker, depositNonce),
+            rewardPool: (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, (0, solana_1.pk)(stakePool), (0, solana_1.pk)(stakePoolMint), rewardPoolNonce),
         })
             .instruction();
         return { ixs: [instruction] };
@@ -285,31 +298,4 @@ class SolanaStakingClient {
         }
     }
 }
-exports.default = SolanaStakingClient;
-function pk(address) {
-    return typeof address === "string" ? new web3_js_1.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;
-    }, []);
-}
+exports.SolanaStakingClient = SolanaStakingClient;

package/dist/cjs/solana/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REWARD_POOL_PROGRAM_ID = exports.STAKE_POOL_PROGRAM_ID = exports.REWARD_ENTRY_BYTE_OFFSETS = exports.REWARD_ENTRY_STAKE_ENTRY_OFFSET = exports.REWARD_ENTRY_REWARD_POOL_OFFSET = exports.REWARD_POOL_BYTE_OFFSETS = exports.REWARD_POOL_MINT_OFFSET = exports.REWARD_POOL_STAKE_POOL_OFFSET = exports.STAKE_POOL_BYTE_OFFSETS = exports.STAKE_POOL_CREATOR_OFFSET = exports.STAKE_POOL_MINT_OFFSET = exports.STAKE_ENTRY_BYTE_OFFSETS = exports.STAKE_ENTRY_OWNER_OFFSET = exports.STAKE_ENTRY_STAKE_POOL_OFFSET = exports.ANCHOR_DISCRIMINATOR_OFFSET = exports.STREAMFLOW_TREASURY_PUBLIC_KEY = exports.FEE_VALUE_PREFIX = exports.CONFIG_PREFIX = exports.REWARD_ENTRY_PREFIX = exports.REWARD_VAULT_PREFIX = exports.REWARD_POOL_PREFIX = exports.STAKE_VAULT_PREFIX = exports.STAKE_MINT_PREFIX = exports.STAKE_POOL_PREFIX = exports.STAKE_ENTRY_PREFIX = exports.STAKE_ENTRY_DISCRIMINATOR = exports.U64_MAX = exports.SCALE_PRECISION_FACTOR_BN = exports.SCALE_PRECISION_FACTOR = exports.DEFAULT_FEE_BN = exports.DEFAULT_FEE = exports.FEE_PRECISION_FACTOR_BN = exports.FEE_PRECISION_FACTOR = void 0;
+exports.FEE_PROGRAM_ID = exports.REWARD_POOL_PROGRAM_ID = exports.STAKE_POOL_PROGRAM_ID = exports.REWARD_ENTRY_BYTE_OFFSETS = exports.REWARD_ENTRY_STAKE_ENTRY_OFFSET = exports.REWARD_ENTRY_REWARD_POOL_OFFSET = exports.REWARD_POOL_BYTE_OFFSETS = exports.REWARD_POOL_MINT_OFFSET = exports.REWARD_POOL_STAKE_POOL_OFFSET = exports.STAKE_POOL_BYTE_OFFSETS = exports.STAKE_POOL_CREATOR_OFFSET = exports.STAKE_POOL_MINT_OFFSET = exports.STAKE_ENTRY_BYTE_OFFSETS = exports.STAKE_ENTRY_OWNER_OFFSET = exports.STAKE_ENTRY_STAKE_POOL_OFFSET = exports.ANCHOR_DISCRIMINATOR_OFFSET = exports.STREAMFLOW_TREASURY_PUBLIC_KEY = exports.FEE_VALUE_PREFIX = exports.CONFIG_PREFIX = exports.REWARD_ENTRY_PREFIX = exports.REWARD_VAULT_PREFIX = exports.REWARD_POOL_PREFIX = exports.STAKE_VAULT_PREFIX = exports.STAKE_MINT_PREFIX = exports.STAKE_POOL_PREFIX = exports.STAKE_ENTRY_PREFIX = exports.STAKE_ENTRY_DISCRIMINATOR = exports.U64_MAX = exports.SCALE_PRECISION_FACTOR_BN = exports.SCALE_PRECISION_FACTOR = exports.DEFAULT_FEE_BN = exports.DEFAULT_FEE = exports.FEE_PRECISION_FACTOR_BN = exports.FEE_PRECISION_FACTOR = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const common_1 = require("@streamflow/common");
 const web3_js_1 = require("@solana/web3.js");
@@ -59,3 +59,9 @@ exports.REWARD_POOL_PROGRAM_ID = {
     [common_1.ICluster.Testnet]: "RWRDdfRbi3339VgKxTAXg4cjyniF7cbhNbMxZWiSKmj",
     [common_1.ICluster.Local]: "RWRDdfRbi3339VgKxTAXg4cjyniF7cbhNbMxZWiSKmj",
 };
+exports.FEE_PROGRAM_ID = {
+    [common_1.ICluster.Mainnet]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+    [common_1.ICluster.Devnet]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+    [common_1.ICluster.Testnet]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+    [common_1.ICluster.Local]: "FEELzfBhsWXTNJX53zZcDVfRNoFYZQ6cZA3jLiGVL16V",
+};

package/dist/cjs/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"
                     },
                     {