@streamflow/staking 8.0.1 → 8.0.2-alpha.p287.a3616ff

package/dist/esm/index.js

@@ -2,7 +2,7 @@ import { Program, translateError, parseIdlErrors } from '@coral-xyz/anchor';
 import { TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
 import { PublicKey, Connection } from '@solana/web3.js';
 import { ICluster, invariant, ContractError, getNumberFromBN, getBN, divCeilN } from '@streamflow/common';
-import { buildSendThrottler, getFilters, pk, checkOrCreateAtaBatch, prepareTransaction, prepareBaseInstructions, signAndExecuteTransaction } from '@streamflow/common/solana';
+import { buildSendThrottler, getFilters, unwrapExecutionParams, createAndEstimateTransaction, prepareBaseInstructions, pk, checkOrCreateAtaBatch, prepareTransaction, signAndExecuteTransaction } from '@streamflow/common/solana';
 import BN3 from 'bn.js';
 import '@solana/wallet-adapter-base';
 
@@ -2443,8 +2443,16 @@ var SolanaStakingClient = class {
     return feeManagerProgram.account.feeValue.fetchNullable(feeValueKey);
   }
   async createStakePool(data, extParams) {
-    const { ixs, publicKey } = await this.prepareCreateStakePoolInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const { ixs, publicKey } = await createAndEstimateTransaction(
+      async (params) => this.prepareCreateStakePoolInstructions(data, params).then((res) => ({
+        ixs: prepareBaseInstructions(this.connection, params).concat(res.ixs),
+        publicKey: res.publicKey
+      })),
+      executionParams,
+      (res) => res.ixs
+    );
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature,
@@ -2474,8 +2482,14 @@ var SolanaStakingClient = class {
     return { ixs: [createInstruction], publicKey: stakePoolPDA };
   }
   async stake(data, extParams) {
-    const { ixs } = await this.prepareStakeInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const ixs = await createAndEstimateTransaction(
+      (params) => this.prepareStakeInstructions(data, params).then(
+        (res) => prepareBaseInstructions(this.connection, params).concat(res.ixs)
+      ),
+      executionParams
+    );
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature
@@ -2499,8 +2513,14 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async unstake(data, extParams) {
-    const { ixs } = await this.prepareUnstakeInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const ixs = await createAndEstimateTransaction(
+      (params) => this.prepareUnstakeInstructions(data, params).then(
+        (res) => prepareBaseInstructions(this.connection, params).concat(res.ixs)
+      ),
+      executionParams
+    );
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature
@@ -2524,8 +2544,16 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async createRewardPool(data, extParams) {
-    const { ixs, publicKey } = await this.prepareCreateRewardPoolInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const { ixs, publicKey } = await createAndEstimateTransaction(
+      async (params) => this.prepareCreateRewardPoolInstructions(data, params).then((res) => ({
+        ixs: prepareBaseInstructions(this.connection, params).concat(res.ixs),
+        publicKey: res.publicKey
+      })),
+      executionParams,
+      (res) => res.ixs
+    );
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature,
@@ -2555,8 +2583,14 @@ var SolanaStakingClient = class {
     return { publicKey: rewardPoolKey, ixs: [instruction] };
   }
   async claimRewards(data, extParams) {
-    const { ixs } = await this.prepareClaimRewardsInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const ixs = await createAndEstimateTransaction(
+      (params) => this.prepareClaimRewardsInstructions(data, params).then(
+        (res) => prepareBaseInstructions(this.connection, params).concat(res.ixs)
+      ),
+      executionParams
+    );
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature
@@ -2576,8 +2610,14 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async fundPool(data, extParams) {
-    const { ixs } = await this.prepareFundPoolInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const ixs = await createAndEstimateTransaction(
+      (params) => this.prepareFundPoolInstructions(data, params).then(
+        (res) => prepareBaseInstructions(this.connection, params).concat(res.ixs)
+      ),
+      executionParams
+    );
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature
@@ -2610,8 +2650,13 @@ var SolanaStakingClient = class {
     return { ixs: treasuryATA ? treasuryATA.concat([instruction]) : [instruction] };
   }
   async createRewardEntry(data, extParams) {
-    const { ixs } = await this.prepareCreateRewardEntryInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const ixs = await createAndEstimateTransaction(async (params) => {
+      return this.prepareCreateRewardEntryInstructions(data, params).then(
+        (res) => prepareBaseInstructions(this.connection, params).concat(res.ixs)
+      );
+    }, executionParams);
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature
@@ -2630,8 +2675,13 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async updateRewardPool(data, extParams) {
-    const { ixs } = await this.prepareUpdateRewardPoolInstructions(data, extParams);
-    const { signature } = await this.execute(ixs, extParams);
+    const executionParams = unwrapExecutionParams(extParams, this.connection);
+    const ixs = await createAndEstimateTransaction(async (params) => {
+      return this.prepareUpdateRewardPoolInstructions(data, params).then(
+        (res) => prepareBaseInstructions(this.connection, params).concat(res.ixs)
+      );
+    }, executionParams);
+    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
     return {
       ixs,
       txId: signature
@@ -2663,23 +2713,19 @@ var SolanaStakingClient = class {
     );
     return accountEntity.discriminator;
   }
-  async execute(ixs, extParams) {
-    const { tx, hash, context } = await prepareTransaction(
-      this.connection,
-      prepareBaseInstructions(this.connection, extParams).concat(ixs),
-      extParams.invoker.publicKey
-    );
+  async execute(ixs, invoker, skipSimulation = false) {
+    const { tx, hash, context } = await prepareTransaction(this.connection, ixs, invoker.publicKey);
     try {
       const signature = await signAndExecuteTransaction(
         this.connection,
-        extParams.invoker,
+        invoker,
         tx,
         {
           hash,
           context,
           commitment: this.getCommitment()
         },
-        { sendThrottler: this.sendThrottler }
+        { sendThrottler: this.sendThrottler, skipSimulation }
       );
       return { signature };
     } catch (err) {