@streamflow/staking 7.0.2 → 7.0.3-alpha.0

package/dist/cjs/solana/client.js

@@ -129,8 +129,8 @@ class SolanaStakingClient {
         const staker = extParams.invoker.publicKey;
         (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 stakeMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, staker, true, (0, solana_1.pk)(tokenProgramId));
+        const poolMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)((0, solana_1.pk)(stakePoolMint), staker, true, (0, solana_1.pk)(tokenProgramId));
         const instruction = await stakePoolProgram.methods
             .stake(nonce, amount, duration)
             .accounts({
@@ -158,8 +158,8 @@ class SolanaStakingClient {
         (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 poolMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)((0, solana_1.pk)(stakePoolMint), staker, true, (0, solana_1.pk)(tokenProgramId));
+        const stakeMintAccountKey = (0, spl_token_1.getAssociatedTokenAddressSync)(stakeMintKey, staker, true, (0, solana_1.pk)(tokenProgramId));
         const instruction = await stakePoolProgram.methods
             .unstake()
             .accounts({
@@ -181,12 +181,12 @@ class SolanaStakingClient {
             metadataId: publicKey,
         };
     }
-    async prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless = false, stakePool, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID, }, extParams) {
+    async prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless = false, stakePool, lastClaimPeriodOpt, tokenProgramId = spl_token_1.TOKEN_PROGRAM_ID, }, extParams) {
         const { rewardPoolProgram } = this.programs;
         const creator = extParams.invoker.publicKey;
         (0, common_1.invariant)(creator, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
-            .createPool(nonce, rewardAmount, rewardPeriod, permissionless)
+            .createPool(nonce, rewardAmount, rewardPeriod, permissionless, lastClaimPeriodOpt)
             .accounts({
             creator,
             stakePool,
@@ -216,7 +216,7 @@ class SolanaStakingClient {
             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)((0, solana_1.pk)(rewardMint), staker, false, (0, solana_1.pk)(tokenProgramId)),
+            to: (0, spl_token_1.getAssociatedTokenAddressSync)((0, solana_1.pk)(rewardMint), staker, true, (0, solana_1.pk)(tokenProgramId)),
         })
             .instruction();
         return { ixs: [instruction] };
@@ -245,7 +245,7 @@ class SolanaStakingClient {
             .accountsPartial({
             funder: staker,
             rewardPool: rewardPoolPda,
-            from: (0, spl_token_1.getAssociatedTokenAddressSync)(rewardMintPk, staker, false, tokenProgramPk),
+            from: (0, spl_token_1.getAssociatedTokenAddressSync)(rewardMintPk, staker, true, tokenProgramPk),
             tokenProgram: tokenProgramId,
             vault: (0, derive_accounts_js_1.deriveRewardVaultPDA)(rewardPoolProgram.programId, rewardPoolPda),
             mint: rewardMint,
@@ -262,7 +262,7 @@ class SolanaStakingClient {
             txId: signature,
         };
     }
-    async prepareCreateRewardEntryInstructions({ stakePoolMint, stakePool, rewardPoolNonce, depositNonce }, extParams) {
+    async prepareCreateRewardEntryInstructions({ stakePool, rewardPoolNonce, depositNonce, rewardMint }, extParams) {
         const { stakePoolProgram, rewardPoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
         (0, common_1.invariant)(staker, "Undefined invoker publicKey");
@@ -272,7 +272,7 @@ class SolanaStakingClient {
             payer: staker,
             authority: staker,
             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),
+            rewardPool: (0, derive_accounts_js_1.deriveRewardPoolPDA)(rewardPoolProgram.programId, (0, solana_1.pk)(stakePool), (0, solana_1.pk)(rewardMint), rewardPoolNonce),
         })
             .instruction();
         return { ixs: [instruction] };
@@ -285,13 +285,14 @@ class SolanaStakingClient {
             txId: signature,
         };
     }
-    async prepareUpdateRewardPoolInstructions({ rewardPool, rewardAmount, rewardPeriod }, extParams) {
+    async prepareUpdateRewardPoolInstructions({ rewardPool, rewardAmount, rewardPeriod, stakePool }, extParams) {
         const { rewardPoolProgram } = this.programs;
         const invoker = extParams.invoker.publicKey;
         (0, common_1.invariant)(invoker, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
             .updatePool(rewardAmount, rewardPeriod)
             .accountsPartial({
+            stakePool,
             authority: invoker,
             rewardPool,
         })

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

@@ -278,6 +278,12 @@
                 {
                     "name": "permissionless",
                     "type": "bool"
+                },
+                {
+                    "name": "last_claim_period_opt",
+                    "type": {
+                        "option": "u64"
+                    }
                 }
             ]
         },
@@ -407,9 +413,14 @@
                     "signer": true,
                     "relations": ["reward_pool"]
                 },
+                {
+                    "name": "stake_pool",
+                    "docs": ["Stake Pool to Which Reward Pool belongs"],
+                    "relations": ["reward_pool"]
+                },
                 {
                     "name": "reward_pool",
-                    "docs": ["Stake Pool"],
+                    "docs": ["Reward Pool"],
                     "writable": true
                 }
             ],
@@ -520,6 +531,16 @@
             "code": 6012,
             "name": "RewardPoolDrained",
             "msg": "Reward Pool does not have enough Rewards for Claiming"
+        },
+        {
+            "code": 6013,
+            "name": "UpdateTooSoon",
+            "msg": "Repeated update can not happen sooner than the stake pool max duration"
+        },
+        {
+            "code": 6014,
+            "name": "InvalidLastClaimPeriod",
+            "msg": "Invalid last claim period provided"
         }
     ],
     "types": [
@@ -731,11 +752,16 @@
                         "docs": ["Time when Reward Pool was created"],
                         "type": "u64"
                     },
+                    {
+                        "name": "last_claim_period",
+                        "docs": ["For how much seconds after unstake user should be able to claim rewards"],
+                        "type": "u64"
+                    },
                     {
                         "name": "_buffer",
                         "docs": ["Buffer for additional fields"],
                         "type": {
-                            "array": ["u8", 56]
+                            "array": ["u8", 48]
                         }
                     }
                 ]

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

@@ -58,7 +58,7 @@ export declare class SolanaStakingClient {
         ixs: TransactionInstruction[];
     }>;
     createRewardPool(data: CreateRewardPoolArgs, extParams: IInteractSolanaExt): Promise<CreationResult>;
-    prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless, stakePool, tokenProgramId, }: CreateRewardPoolArgs, extParams: IInteractSolanaExt): Promise<{
+    prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless, stakePool, lastClaimPeriodOpt, tokenProgramId, }: CreateRewardPoolArgs, extParams: IInteractSolanaExt): Promise<{
         publicKey: PublicKey;
         ixs: TransactionInstruction[];
     }>;
@@ -71,14 +71,14 @@ export declare class SolanaStakingClient {
         ixs: TransactionInstruction[];
     }>;
     createRewardEntry(data: CreateRewardEntryArgs, extParams: IInteractSolanaExt): Promise<ITransactionResult>;
-    prepareCreateRewardEntryInstructions({ stakePoolMint, stakePool, rewardPoolNonce, depositNonce }: CreateRewardEntryArgs, extParams: IInteractSolanaExt): Promise<{
+    prepareCreateRewardEntryInstructions({ stakePool, rewardPoolNonce, depositNonce, rewardMint }: CreateRewardEntryArgs, extParams: IInteractSolanaExt): Promise<{
         ixs: TransactionInstruction[];
     }>;
     updateRewardPool(data: UpdateRewardPoolArgs, extParams: IInteractSolanaExt): Promise<{
         ixs: TransactionInstruction[];
         txId: string;
     }>;
-    prepareUpdateRewardPoolInstructions({ rewardPool, rewardAmount, rewardPeriod }: UpdateRewardPoolArgs, extParams: IInteractSolanaExt): Promise<{
+    prepareUpdateRewardPoolInstructions({ rewardPool, rewardAmount, rewardPeriod, stakePool }: UpdateRewardPoolArgs, extParams: IInteractSolanaExt): Promise<{
         ixs: TransactionInstruction[];
     }>;
     decode<ProgramName extends keyof Programs = keyof Programs, DecodingProgram = Programs[ProgramName], DerivedIdl extends Idl = DecodingProgram extends Program<infer IDLType> ? IDLType : never, AccountName extends keyof IdlTypes<DerivedIdl> = keyof IdlTypes<DerivedIdl>, DecodedAccount = IdlTypes<DerivedIdl>[AccountName]>(programKey: ProgramName, accountName: AccountName, accInfo: Parameters<AccountsCoder["decode"]>[1]): DecodedAccount;

package/dist/esm/solana/client.js

@@ -127,8 +127,8 @@ export class SolanaStakingClient {
         const staker = extParams.invoker.publicKey;
         invariant(staker, "Undefined invoker publicKey");
         const mint = deriveStakeMintPDA(stakePoolProgram.programId, pk(stakePool));
-        const stakeMintAccountKey = getAssociatedTokenAddressSync(mint, staker, false, pk(tokenProgramId));
-        const poolMintAccountKey = getAssociatedTokenAddressSync(pk(stakePoolMint), staker, false, pk(tokenProgramId));
+        const stakeMintAccountKey = getAssociatedTokenAddressSync(mint, staker, true, pk(tokenProgramId));
+        const poolMintAccountKey = getAssociatedTokenAddressSync(pk(stakePoolMint), staker, true, pk(tokenProgramId));
         const instruction = await stakePoolProgram.methods
             .stake(nonce, amount, duration)
             .accounts({
@@ -156,8 +156,8 @@ export class SolanaStakingClient {
         invariant(staker, "Undefined invoker publicKey");
         const stakeMintKey = deriveStakeMintPDA(stakePoolProgram.programId, pk(stakePool));
         const stakeEntryKey = deriveStakeEntryPDA(stakePoolProgram.programId, pk(stakePool), staker, nonce);
-        const poolMintAccountKey = getAssociatedTokenAddressSync(pk(stakePoolMint), staker, false, pk(tokenProgramId));
-        const stakeMintAccountKey = getAssociatedTokenAddressSync(stakeMintKey, staker, false, pk(tokenProgramId));
+        const poolMintAccountKey = getAssociatedTokenAddressSync(pk(stakePoolMint), staker, true, pk(tokenProgramId));
+        const stakeMintAccountKey = getAssociatedTokenAddressSync(stakeMintKey, staker, true, pk(tokenProgramId));
         const instruction = await stakePoolProgram.methods
             .unstake()
             .accounts({
@@ -179,12 +179,12 @@ export class SolanaStakingClient {
             metadataId: publicKey,
         };
     }
-    async prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless = false, stakePool, tokenProgramId = TOKEN_PROGRAM_ID, }, extParams) {
+    async prepareCreateRewardPoolInstructions({ nonce, rewardAmount, rewardPeriod, rewardMint, permissionless = false, stakePool, lastClaimPeriodOpt, tokenProgramId = TOKEN_PROGRAM_ID, }, extParams) {
         const { rewardPoolProgram } = this.programs;
         const creator = extParams.invoker.publicKey;
         invariant(creator, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
-            .createPool(nonce, rewardAmount, rewardPeriod, permissionless)
+            .createPool(nonce, rewardAmount, rewardPeriod, permissionless, lastClaimPeriodOpt)
             .accounts({
             creator,
             stakePool,
@@ -214,7 +214,7 @@ export class SolanaStakingClient {
             rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, pk(stakePool), pk(rewardMint), rewardPoolNonce),
             claimant: staker,
             tokenProgram: tokenProgramId,
-            to: getAssociatedTokenAddressSync(pk(rewardMint), staker, false, pk(tokenProgramId)),
+            to: getAssociatedTokenAddressSync(pk(rewardMint), staker, true, pk(tokenProgramId)),
         })
             .instruction();
         return { ixs: [instruction] };
@@ -243,7 +243,7 @@ export class SolanaStakingClient {
             .accountsPartial({
             funder: staker,
             rewardPool: rewardPoolPda,
-            from: getAssociatedTokenAddressSync(rewardMintPk, staker, false, tokenProgramPk),
+            from: getAssociatedTokenAddressSync(rewardMintPk, staker, true, tokenProgramPk),
             tokenProgram: tokenProgramId,
             vault: deriveRewardVaultPDA(rewardPoolProgram.programId, rewardPoolPda),
             mint: rewardMint,
@@ -260,7 +260,7 @@ export class SolanaStakingClient {
             txId: signature,
         };
     }
-    async prepareCreateRewardEntryInstructions({ stakePoolMint, stakePool, rewardPoolNonce, depositNonce }, extParams) {
+    async prepareCreateRewardEntryInstructions({ stakePool, rewardPoolNonce, depositNonce, rewardMint }, extParams) {
         const { stakePoolProgram, rewardPoolProgram } = this.programs;
         const staker = extParams.invoker.publicKey;
         invariant(staker, "Undefined invoker publicKey");
@@ -270,7 +270,7 @@ export class SolanaStakingClient {
             payer: staker,
             authority: staker,
             stakeEntry: deriveStakeEntryPDA(stakePoolProgram.programId, pk(stakePool), staker, depositNonce),
-            rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, pk(stakePool), pk(stakePoolMint), rewardPoolNonce),
+            rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, pk(stakePool), pk(rewardMint), rewardPoolNonce),
         })
             .instruction();
         return { ixs: [instruction] };
@@ -283,13 +283,14 @@ export class SolanaStakingClient {
             txId: signature,
         };
     }
-    async prepareUpdateRewardPoolInstructions({ rewardPool, rewardAmount, rewardPeriod }, extParams) {
+    async prepareUpdateRewardPoolInstructions({ rewardPool, rewardAmount, rewardPeriod, stakePool }, extParams) {
         const { rewardPoolProgram } = this.programs;
         const invoker = extParams.invoker.publicKey;
         invariant(invoker, "Undefined invoker publicKey");
         const instruction = await rewardPoolProgram.methods
             .updatePool(rewardAmount, rewardPeriod)
             .accountsPartial({
+            stakePool,
             authority: invoker,
             rewardPool,
         })

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

@@ -278,6 +278,12 @@
                 {
                     "name": "permissionless",
                     "type": "bool"
+                },
+                {
+                    "name": "last_claim_period_opt",
+                    "type": {
+                        "option": "u64"
+                    }
                 }
             ]
         },
@@ -407,9 +413,14 @@
                     "signer": true,
                     "relations": ["reward_pool"]
                 },
+                {
+                    "name": "stake_pool",
+                    "docs": ["Stake Pool to Which Reward Pool belongs"],
+                    "relations": ["reward_pool"]
+                },
                 {
                     "name": "reward_pool",
-                    "docs": ["Stake Pool"],
+                    "docs": ["Reward Pool"],
                     "writable": true
                 }
             ],
@@ -520,6 +531,16 @@
             "code": 6012,
             "name": "RewardPoolDrained",
             "msg": "Reward Pool does not have enough Rewards for Claiming"
+        },
+        {
+            "code": 6013,
+            "name": "UpdateTooSoon",
+            "msg": "Repeated update can not happen sooner than the stake pool max duration"
+        },
+        {
+            "code": 6014,
+            "name": "InvalidLastClaimPeriod",
+            "msg": "Invalid last claim period provided"
         }
     ],
     "types": [
@@ -731,11 +752,16 @@
                         "docs": ["Time when Reward Pool was created"],
                         "type": "u64"
                     },
+                    {
+                        "name": "last_claim_period",
+                        "docs": ["For how much seconds after unstake user should be able to claim rewards"],
+                        "type": "u64"
+                    },
                     {
                         "name": "_buffer",
                         "docs": ["Buffer for additional fields"],
                         "type": {
-                            "array": ["u8", 56]
+                            "array": ["u8", 48]
                         }
                     }
                 ]

package/dist/esm/solana/descriptor/reward_pool.d.ts

@@ -284,6 +284,12 @@ export type RewardPool = {
                 {
                     name: "permissionless";
                     type: "bool";
+                },
+                {
+                    name: "lastClaimPeriodOpt";
+                    type: {
+                        option: "u64";
+                    };
                 }
             ];
         },
@@ -443,9 +449,14 @@ export type RewardPool = {
                     signer: true;
                     relations: ["rewardPool"];
                 },
+                {
+                    name: "stakePool";
+                    docs: ["Stake Pool to Which Reward Pool belongs"];
+                    relations: ["rewardPool"];
+                },
                 {
                     name: "rewardPool";
-                    docs: ["Stake Pool"];
+                    docs: ["Reward Pool"];
                     writable: true;
                 }
             ];
@@ -556,6 +567,16 @@ export type RewardPool = {
             code: 6012;
             name: "rewardPoolDrained";
             msg: "Reward Pool does not have enough Rewards for Claiming";
+        },
+        {
+            code: 6013;
+            name: "updateTooSoon";
+            msg: "Repeated update can not happen sooner than the stake pool max duration";
+        },
+        {
+            code: 6014;
+            name: "invalidLastClaimPeriod";
+            msg: "Invalid last claim period provided";
         }
     ];
     types: [
@@ -767,11 +788,16 @@ export type RewardPool = {
                         docs: ["Time when Reward Pool was created"];
                         type: "u64";
                     },
+                    {
+                        name: "lastClaimPeriod";
+                        docs: ["For how much seconds after unstake user should be able to claim rewards"];
+                        type: "u64";
+                    },
                     {
                         name: "buffer";
                         docs: ["Buffer for additional fields"];
                         type: {
-                            array: ["u8", 56];
+                            array: ["u8", 48];
                         };
                     }
                 ];

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

@@ -41,6 +41,7 @@ export interface FundPoolArgs extends BaseStakePoolArgs, TokenProgram {
 export interface CreateRewardEntryArgs extends BaseStakePoolArgs, TokenProgram {
     depositNonce: number;
     rewardPoolNonce: number;
+    rewardMint: Address;
 }
 export interface CreateRewardPoolArgs extends BaseStakePoolArgs, TokenProgram {
     stakePoolNonce: number;
@@ -49,8 +50,10 @@ export interface CreateRewardPoolArgs extends BaseStakePoolArgs, TokenProgram {
     rewardAmount: BN;
     rewardPeriod: BN;
     permissionless: boolean;
+    lastClaimPeriodOpt: BN | null;
 }
 export interface UpdateRewardPoolArgs {
+    stakePool: Address;
     rewardAmount: BN | null;
     rewardPeriod: BN | null;
     rewardPool: Address;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamflow/staking",
-  "version": "7.0.2",
+  "version": "7.0.3-alpha.0",
   "description": "JavaScript SDK to interact with Streamflow Staking protocol.",
   "homepage": "https://github.com/streamflow-finance/js-sdk/",
   "main": "dist/esm/index.js",
@@ -25,11 +25,11 @@
     "pack": "pnpm build && pnpm pack",
     "lint": "eslint --fix .",
     "test": "vitest",
-    "prepublishOnly": "npm run lint && npm run build"
+    "prepublishOnly": "pnpm run lint && pnpm run test run && pnpm run build"
   },
-  "gitHead": "7e273924c589968c2646af616cd955e1abadc817",
+  "gitHead": "13884be9cf8313252173aadc45842a4598b1e335",
   "devDependencies": {
-    "@streamflow/eslint-config": "7.0.2",
+    "@streamflow/eslint-config": "7.0.3-alpha.0",
     "@types/bn.js": "5.1.1",
     "typescript": "^5.6.3"
   },
@@ -40,7 +40,7 @@
     "@solana/spl-token": "0.4.9",
     "@solana/wallet-adapter-base": "0.9.19",
     "@solana/web3.js": "1.95.4",
-    "@streamflow/common": "7.0.2",
+    "@streamflow/common": "7.0.3-alpha.0",
     "bn.js": "5.2.1",
     "borsh": "^2.0.0",
     "bs58": "5.0.0",