@streamflow/staking 9.0.4 → 10.0.0-alpha.p313.18b7be3

package/README.md

@@ -344,7 +344,7 @@ SolanaStakingClient also exposes original IDL of all programs, so you can use so
 
 ```typescript
 // Stake Mint Token Program matches token program of the original token, program exposes separate methods depending on the program.
-import { signAndExecuteTransaction, prepareTransaction } from "@streamflow/common/solana";
+import { signAndExecuteTransaction, prepareTransaction } from "@streamflow/common";
 
 const program = client.programs.stakePoolProgram;
 

package/dist/cjs/index.cjs

@@ -4,7 +4,6 @@ var anchor = require('@coral-xyz/anchor');
 var splToken = require('@solana/spl-token');
 var web3_js = require('@solana/web3.js');
 var common = require('@streamflow/common');
-var solana = require('@streamflow/common/solana');
 var BN4 = require('bn.js');
 require('@solana/wallet-adapter-base');
 
@@ -7104,7 +7103,7 @@ var SolanaStakingClient = class {
     this.cluster = cluster;
     this.commitment = commitment;
     this.connection = new web3_js.Connection(clusterUrl, this.commitment);
-    this.sendThrottler = sendThrottler ?? solana.buildSendThrottler(sendRate);
+    this.sendThrottler = sendThrottler ?? common.buildSendThrottler(sendRate);
     const stakePoolIdl = {
       ...stake_pool_default,
       address: programIds?.stakePool ?? STAKE_POOL_PROGRAM_ID[cluster] ?? stake_pool_default.address
@@ -7157,7 +7156,7 @@ var SolanaStakingClient = class {
   }
   async searchStakePools(criteria = {}) {
     const { stakePoolProgram } = this.programs;
-    return stakePoolProgram.account.stakePool.all(solana.getFilters(criteria, STAKE_POOL_BYTE_OFFSETS));
+    return stakePoolProgram.account.stakePool.all(common.getFilters(criteria, STAKE_POOL_BYTE_OFFSETS));
   }
   async getStakeEntry(id) {
     const { stakePoolProgram } = this.programs;
@@ -7165,15 +7164,15 @@ var SolanaStakingClient = class {
   }
   async searchStakeEntries(criteria = {}) {
     const { stakePoolProgram } = this.programs;
-    return stakePoolProgram.account.stakeEntry.all(solana.getFilters(criteria, STAKE_ENTRY_BYTE_OFFSETS));
+    return stakePoolProgram.account.stakeEntry.all(common.getFilters(criteria, STAKE_ENTRY_BYTE_OFFSETS));
   }
   async searchRewardPools(criteria = {}) {
     const { rewardPoolProgram } = this.programs;
-    return rewardPoolProgram.account.rewardPool.all(solana.getFilters(criteria, REWARD_POOL_BYTE_OFFSETS));
+    return rewardPoolProgram.account.rewardPool.all(common.getFilters(criteria, REWARD_POOL_BYTE_OFFSETS));
   }
   async searchRewardEntries(criteria) {
     const { rewardPoolProgram } = this.programs;
-    return rewardPoolProgram.account.rewardEntry.all(solana.getFilters(criteria, REWARD_ENTRY_BYTE_OFFSETS));
+    return rewardPoolProgram.account.rewardEntry.all(common.getFilters(criteria, REWARD_ENTRY_BYTE_OFFSETS));
   }
   async getFee(target) {
     const perTargetFee = await this.getFeeValueIfExists(target);
@@ -7243,7 +7242,7 @@ var SolanaStakingClient = class {
       mint,
       tokenProgram: tokenProgramId
     }).instruction();
-    const stakePoolPDA = deriveStakePoolPDA(stakePoolProgram.programId, solana.pk(mint), creator, nonce);
+    const stakePoolPDA = deriveStakePoolPDA(stakePoolProgram.programId, common.pk(mint), creator, nonce);
     return { ixs: [createInstruction], publicKey: stakePoolPDA };
   }
   async stake(data, extParams) {
@@ -7294,7 +7293,7 @@ var SolanaStakingClient = class {
     const { stakePoolProgram } = this.programs;
     const staker = extParams.invoker.publicKey;
     common.invariant(staker, "Undefined invoker publicKey");
-    const poolMintAccountKey = splToken.getAssociatedTokenAddressSync(solana.pk(stakePoolMint), staker, true, solana.pk(tokenProgramId));
+    const poolMintAccountKey = splToken.getAssociatedTokenAddressSync(common.pk(stakePoolMint), staker, true, common.pk(tokenProgramId));
     const instruction = await stakePoolProgram.methods.stake(nonce, amount, duration).accounts({
       stakePool,
       tokenProgram: tokenProgramId,
@@ -7392,8 +7391,8 @@ var SolanaStakingClient = class {
     const { stakePoolProgram } = this.programs;
     const staker = extParams.invoker.publicKey;
     common.invariant(staker, "Undefined invoker publicKey");
-    const stakeEntryKey = deriveStakeEntryPDA(stakePoolProgram.programId, solana.pk(stakePool), staker, nonce);
-    const poolMintAccountKey = splToken.getAssociatedTokenAddressSync(solana.pk(stakePoolMint), staker, true, solana.pk(tokenProgramId));
+    const stakeEntryKey = deriveStakeEntryPDA(stakePoolProgram.programId, common.pk(stakePool), staker, nonce);
+    const poolMintAccountKey = splToken.getAssociatedTokenAddressSync(common.pk(stakePoolMint), staker, true, common.pk(tokenProgramId));
     const instruction = await stakePoolProgram.methods.unstake(shouldClose).accounts({
       stakeEntry: stakeEntryKey,
       to: poolMintAccountKey,
@@ -7414,7 +7413,7 @@ var SolanaStakingClient = class {
     const { stakePoolProgram } = this.programs;
     const staker = extParams.invoker.publicKey;
     common.invariant(staker, "Undefined invoker publicKey");
-    const stakeEntryKey = deriveStakeEntryPDA(stakePoolProgram.programId, solana.pk(stakePool), staker, nonce);
+    const stakeEntryKey = deriveStakeEntryPDA(stakePoolProgram.programId, common.pk(stakePool), staker, nonce);
     const instruction = await stakePoolProgram.methods.closeEntry().accounts({
       stakeEntry: stakeEntryKey,
       authority: staker
@@ -7449,7 +7448,7 @@ var SolanaStakingClient = class {
       mint: rewardMint,
       tokenProgram: tokenProgramId
     }).instruction();
-    const rewardPoolKey = deriveRewardPoolPDA(rewardPoolProgram.programId, solana.pk(stakePool), solana.pk(rewardMint), nonce);
+    const rewardPoolKey = deriveRewardPoolPDA(rewardPoolProgram.programId, common.pk(stakePool), common.pk(rewardMint), nonce);
     return { publicKey: rewardPoolKey, ixs: [instruction] };
   }
   async claimRewards(data, extParams) {
@@ -7476,16 +7475,16 @@ var SolanaStakingClient = class {
     common.invariant(staker, "Undefined invoker publicKey");
     const rewardPoolKey = deriveRewardPoolPDA(
       rewardPoolProgram.programId,
-      solana.pk(stakePool),
-      solana.pk(rewardMint),
+      common.pk(stakePool),
+      common.pk(rewardMint),
       rewardPoolNonce
     );
     let ixBuilder = rewardPoolProgram.methods.claimRewards().accounts({
-      stakeEntry: deriveStakeEntryPDA(stakePoolProgram.programId, solana.pk(stakePool), staker, depositNonce),
+      stakeEntry: deriveStakeEntryPDA(stakePoolProgram.programId, common.pk(stakePool), staker, depositNonce),
       rewardPool: rewardPoolKey,
       claimant: staker,
       tokenProgram: tokenProgramId,
-      to: splToken.getAssociatedTokenAddressSync(solana.pk(rewardMint), staker, true, solana.pk(tokenProgramId))
+      to: splToken.getAssociatedTokenAddressSync(common.pk(rewardMint), staker, true, common.pk(tokenProgramId))
     });
     if (this.isDynamicRewardProgram(rewardPoolProgram)) {
       if (governor === void 0) {
@@ -7516,16 +7515,16 @@ var SolanaStakingClient = class {
     const staker = extParams.invoker.publicKey;
     common.invariant(staker, "Undefined invoker publicKey");
     const existingFee = await this.getFeeValueIfExists(staker);
-    const rewardMintPk = solana.pk(rewardMint);
-    const tokenProgramPk = solana.pk(tokenProgramId);
-    const treasuryATA = !existingFee || existingFee.streamflowFee.gtn(0) ? await solana.checkOrCreateAtaBatch(
+    const rewardMintPk = common.pk(rewardMint);
+    const tokenProgramPk = common.pk(tokenProgramId);
+    const treasuryATA = !existingFee || existingFee.streamflowFee.gtn(0) ? await common.checkOrCreateAtaBatch(
       this.connection,
       [STREAMFLOW_TREASURY_PUBLIC_KEY],
       rewardMintPk,
       extParams.invoker,
       tokenProgramPk
     ) : null;
-    const rewardPoolPda = deriveRewardPoolPDA(rewardPoolProgram.programId, solana.pk(stakePool), rewardMintPk, nonce);
+    const rewardPoolPda = deriveRewardPoolPDA(rewardPoolProgram.programId, common.pk(stakePool), rewardMintPk, nonce);
     const instruction = await rewardPoolProgram.methods.fundPool(amount).accountsPartial({
       funder: staker,
       rewardPool: rewardPoolPda,
@@ -7553,8 +7552,8 @@ var SolanaStakingClient = class {
     const instruction = await rewardPoolProgram.methods.createEntry().accounts({
       payer: staker,
       authority: staker,
-      stakeEntry: deriveStakeEntryPDA(stakePoolProgram.programId, solana.pk(stakePool), staker, depositNonce),
-      rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, solana.pk(stakePool), solana.pk(rewardMint), rewardPoolNonce)
+      stakeEntry: deriveStakeEntryPDA(stakePoolProgram.programId, common.pk(stakePool), staker, depositNonce),
+      rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, common.pk(stakePool), common.pk(rewardMint), rewardPoolNonce)
     }).accountsPartial({
       stakePool
     }).instruction();
@@ -7574,7 +7573,7 @@ var SolanaStakingClient = class {
     common.invariant(staker, "Undefined invoker publicKey");
     const instruction = await rewardPoolProgram.methods.closeEntry(depositNonce).accounts({
       authority: staker,
-      rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, solana.pk(stakePool), solana.pk(rewardMint), rewardPoolNonce)
+      rewardPool: deriveRewardPoolPDA(rewardPoolProgram.programId, common.pk(stakePool), common.pk(rewardMint), rewardPoolNonce)
     }).instruction();
     return { ixs: [instruction] };
   }
@@ -7613,14 +7612,14 @@ var SolanaStakingClient = class {
     return accountEntity.discriminator;
   }
   async execute(ixs, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    ixs = await solana.createAndEstimateTransaction(
-      async (params) => solana.prepareBaseInstructions(this.connection, params).concat(ixs),
+    const executionParams = common.unwrapExecutionParams(extParams, this.connection);
+    ixs = await common.createAndEstimateTransaction(
+      async (params) => common.prepareBaseInstructions(this.connection, params).concat(ixs),
       executionParams
     );
-    const { tx, hash, context } = await solana.prepareTransaction(this.connection, ixs, extParams.invoker.publicKey);
+    const { tx, hash, context } = await common.prepareTransaction(this.connection, ixs, extParams.invoker.publicKey);
     try {
-      const signature = await solana.signAndExecuteTransaction(
+      const signature = await common.signAndExecuteTransaction(
         this.connection,
         extParams.invoker,
         tx,