@streamflow/staking 8.0.1-alpha.p287.54fe41f → 8.0.1

package/dist/cjs/index.cjs

@@ -2449,16 +2449,8 @@ var SolanaStakingClient = class {
     return feeManagerProgram.account.feeValue.fetchNullable(feeValueKey);
   }
   async createStakePool(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const { ixs, publicKey } = await solana.createAndEstimateTransaction(
-      async (params) => this.prepareCreateStakePoolInstructions(data, params).then((res) => ({
-        ixs: solana.prepareBaseInstructions(this.connection, params).concat(res.ixs),
-        publicKey: res.publicKey
-      })),
-      executionParams,
-      (res) => res.ixs
-    );
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs, publicKey } = await this.prepareCreateStakePoolInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature,
@@ -2488,14 +2480,8 @@ var SolanaStakingClient = class {
     return { ixs: [createInstruction], publicKey: stakePoolPDA };
   }
   async stake(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const ixs = await solana.createAndEstimateTransaction(
-      (params) => this.prepareStakeInstructions(data, params).then(
-        (res) => solana.prepareBaseInstructions(this.connection, params).concat(res.ixs)
-      ),
-      executionParams
-    );
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs } = await this.prepareStakeInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature
@@ -2519,14 +2505,8 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async unstake(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const ixs = await solana.createAndEstimateTransaction(
-      (params) => this.prepareUnstakeInstructions(data, params).then(
-        (res) => solana.prepareBaseInstructions(this.connection, params).concat(res.ixs)
-      ),
-      executionParams
-    );
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs } = await this.prepareUnstakeInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature
@@ -2550,16 +2530,8 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async createRewardPool(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const { ixs, publicKey } = await solana.createAndEstimateTransaction(
-      async (params) => this.prepareCreateRewardPoolInstructions(data, params).then((res) => ({
-        ixs: solana.prepareBaseInstructions(this.connection, params).concat(res.ixs),
-        publicKey: res.publicKey
-      })),
-      executionParams,
-      (res) => res.ixs
-    );
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs, publicKey } = await this.prepareCreateRewardPoolInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature,
@@ -2589,14 +2561,8 @@ var SolanaStakingClient = class {
     return { publicKey: rewardPoolKey, ixs: [instruction] };
   }
   async claimRewards(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const ixs = await solana.createAndEstimateTransaction(
-      (params) => this.prepareClaimRewardsInstructions(data, params).then(
-        (res) => solana.prepareBaseInstructions(this.connection, params).concat(res.ixs)
-      ),
-      executionParams
-    );
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs } = await this.prepareClaimRewardsInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature
@@ -2616,14 +2582,8 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async fundPool(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const ixs = await solana.createAndEstimateTransaction(
-      (params) => this.prepareFundPoolInstructions(data, params).then(
-        (res) => solana.prepareBaseInstructions(this.connection, params).concat(res.ixs)
-      ),
-      executionParams
-    );
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs } = await this.prepareFundPoolInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature
@@ -2656,13 +2616,8 @@ var SolanaStakingClient = class {
     return { ixs: treasuryATA ? treasuryATA.concat([instruction]) : [instruction] };
   }
   async createRewardEntry(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const ixs = await solana.createAndEstimateTransaction(async (params) => {
-      return this.prepareCreateRewardEntryInstructions(data, params).then(
-        (res) => solana.prepareBaseInstructions(this.connection, params).concat(res.ixs)
-      );
-    }, executionParams);
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs } = await this.prepareCreateRewardEntryInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature
@@ -2681,13 +2636,8 @@ var SolanaStakingClient = class {
     return { ixs: [instruction] };
   }
   async updateRewardPool(data, extParams) {
-    const executionParams = solana.unwrapExecutionParams(extParams, this.connection);
-    const ixs = await solana.createAndEstimateTransaction(async (params) => {
-      return this.prepareUpdateRewardPoolInstructions(data, params).then(
-        (res) => solana.prepareBaseInstructions(this.connection, params).concat(res.ixs)
-      );
-    }, executionParams);
-    const { signature } = await this.execute(ixs, extParams.invoker, executionParams.skipSimulation);
+    const { ixs } = await this.prepareUpdateRewardPoolInstructions(data, extParams);
+    const { signature } = await this.execute(ixs, extParams);
     return {
       ixs,
       txId: signature
@@ -2719,19 +2669,23 @@ var SolanaStakingClient = class {
     );
     return accountEntity.discriminator;
   }
-  async execute(ixs, invoker, skipSimulation = false) {
-    const { tx, hash, context } = await solana.prepareTransaction(this.connection, ixs, invoker.publicKey);
+  async execute(ixs, extParams) {
+    const { tx, hash, context } = await solana.prepareTransaction(
+      this.connection,
+      solana.prepareBaseInstructions(this.connection, extParams).concat(ixs),
+      extParams.invoker.publicKey
+    );
     try {
       const signature = await solana.signAndExecuteTransaction(
         this.connection,
-        invoker,
+        extParams.invoker,
         tx,
         {
           hash,
           context,
           commitment: this.getCommitment()
         },
-        { sendThrottler: this.sendThrottler, skipSimulation }
+        { sendThrottler: this.sendThrottler }
       );
       return { signature };
     } catch (err) {