@wireio/stake 0.7.1 → 0.7.3

package/lib/stake.browser.js

@@ -9232,23 +9232,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     }
     let gasBuffer = BigInt(0);
     try {
-      const dummyIx = SystemProgram.transfer({
-        fromPubkey: payer,
-        toPubkey: payer,
-        lamports: 0
-      });
-      const tx = new Transaction().add(dummyIx);
-      const { blockhash } = await this.connection.getLatestBlockhash(
-        commitment
-      );
-      tx.recentBlockhash = blockhash;
-      tx.feePayer = payer;
-      const message = tx.compileMessage();
-      const feeInfo = await this.connection.getFeeForMessage(
-        message,
-        commitment
-      );
-      const singleTxFeeLamports = BigInt(feeInfo.value ?? 5e3);
+      const singleTxFeeLamports = await this.getSingleTxFeeLamports();
       const txCount = BigInt(options?.txCount ?? 2);
       const safetyMultiplier = options?.safetyMultiplier ?? 3;
       const safetyScaled = BigInt(Math.round(safetyMultiplier * 100));
@@ -9269,30 +9253,54 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     if (typeof this.getDepositFee !== "function") {
       return gasBuffer;
     }
-    let lo = BigInt(0);
-    let hi = spendable;
-    for (let i = 0; i < 20 && hi - lo > BigInt(1); i++) {
-      const mid = (lo + hi) / BigInt(2);
-      let fee;
-      try {
-        fee = await this.getDepositFee(mid);
-      } catch {
-        return gasBuffer;
-      }
-      if (mid + fee <= spendable) {
-        lo = mid;
-      } else {
-        hi = mid;
-      }
+    let feeAtSpendable;
+    try {
+      feeAtSpendable = await this.getDepositFee(spendable);
+    } catch {
+      return gasBuffer;
     }
-    const fudge = BigInt(1e3);
-    let effectivePrincipal = lo > fudge ? lo - fudge : lo;
+    if (feeAtSpendable <= BigInt(0)) {
+      return gasBuffer;
+    }
+    const s = spendable;
+    const f = feeAtSpendable;
+    const denom = s + f;
+    if (denom === BigInt(0)) {
+      return gasBuffer;
+    }
+    let a = s * s / denom;
+    const fudge = BigInt(1e4);
+    let effectivePrincipal = a > fudge ? a - fudge : a;
     if (effectivePrincipal < BigInt(0)) {
       effectivePrincipal = BigInt(0);
     }
     const buffer = balanceLamports > effectivePrincipal ? balanceLamports - effectivePrincipal : balanceLamports;
     return buffer < gasBuffer ? gasBuffer : buffer;
   }
+  async getSingleTxFeeLamports() {
+    const now = Date.now();
+    if (this.cachedTxFee && now - this.cachedTxFee.fetchedAt < _SolanaStakingClient.FEE_CACHE_TTL_MS) {
+      return this.cachedTxFee.value;
+    }
+    const payer = this.solPubKey;
+    const dummyIx = SystemProgram.transfer({
+      fromPubkey: payer,
+      toPubkey: payer,
+      lamports: 0
+    });
+    const tx = new Transaction().add(dummyIx);
+    const { blockhash } = await this.connection.getLatestBlockhash(commitment);
+    tx.recentBlockhash = blockhash;
+    tx.feePayer = payer;
+    const message = tx.compileMessage();
+    const feeInfo = await this.connection.getFeeForMessage(message, commitment);
+    const singleTxFeeLamports = BigInt(feeInfo.value ?? 5e3);
+    this.cachedTxFee = {
+      value: singleTxFeeLamports,
+      fetchedAt: now
+    };
+    return singleTxFeeLamports;
+  }
   async sendAndConfirmHttp(signed, ctx) {
     this.ensureUser();
     const signature = await this.connection.sendRawTransaction(
@@ -9344,6 +9352,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   }
 };
 _SolanaStakingClient.EPOCHS_PER_YEAR_TTL_MS = 10 * 60 * 1e3;
+_SolanaStakingClient.FEE_CACHE_TTL_MS = 6e4;
 let SolanaStakingClient = _SolanaStakingClient;
 
 var _format$q = "hh-sol-artifact-1";
@@ -36094,7 +36103,7 @@ class Staker {
           break;
         case EvmChainID.Ethereum:
         case EvmChainID.Hoodi:
-          this.clients.set(EvmChainID.Hoodi, new EthereumStakingClient(cfg));
+          this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
           break;
         default:
           console.log(`No staking client available for chain ${cfg.network.chainId}`);