@wireio/stake 2.4.3 → 2.5.0

package/lib/stake.browser.js

@@ -15839,6 +15839,14 @@ function normalizeToBigInt(x) {
   if (typeof x === "number") return BigInt(x);
   throw new Error(`normalizeToBigInt: unsupported type ${typeof x}`);
 }
+const safeFetch = async (promise, label) => {
+  try {
+    return await promise;
+  } catch (err) {
+    console.error(`Safe Fetch Failed${label ? ` (${label})` : ""}:`, err);
+    return null;
+  }
+};
 
 let ConvertClient$1 = class ConvertClient {
   constructor(provider, pgs) {
@@ -16062,10 +16070,12 @@ let ConvertClient$1 = class ConvertClient {
     }
     let slotTimeSec = 0.4;
     try {
-      const samples = await conn.getRecentPerformanceSamples(1);
+      const samples = await conn.getRecentPerformanceSamples(60);
       if (samples?.length) {
-        const s = samples[0];
-        slotTimeSec = s.numSlots > 0 ? s.samplePeriodSecs / s.numSlots : slotTimeSec;
+        const valid = samples.filter((s) => s.numSlots > 0);
+        if (valid.length) {
+          slotTimeSec = valid.reduce((sum, s) => sum + s.samplePeriodSecs / s.numSlots, 0) / valid.length;
+        }
       }
     } catch (_) {
     }
@@ -16367,50 +16377,39 @@ class OutpostClient {
     return buildOutpostAccounts(this.connection, userPk, this.pgs);
   }
   async getTokenBalance(ata) {
-    try {
-      const bal = await this.connection.getTokenAccountBalance(ata);
-      return new BN(bal.value.amount);
-    } catch {
-      return new BN(0);
-    }
+    const bal = await this.connection.getTokenAccountBalance(ata);
+    return new BN(bal.value.amount);
   }
   async fetchWireState(user) {
     const userPk = user ?? this.wallet.publicKey;
-    if (!userPk) {
-      throw new Error("OutpostClient.fetchWireState: wallet not connected");
-    }
+    if (!userPk) throw new Error("OutpostClient.fetchWireState: wallet not connected");
     const pdas = await this.buildAccounts(userPk);
-    try {
-      const [
-        globalState,
-        outpostAccount,
-        distributionState,
-        userPretokenRecord,
-        trancheState
-      ] = await Promise.all([
-        this.program.account.globalState.fetch(pdas.globalState),
-        this.program.account.outpostAccount.fetchNullable(pdas.outpostAccount),
-        this.program.account.distributionState.fetchNullable(pdas.distributionState),
-        this.program.account.userPretokenRecord.fetchNullable(pdas.userPretokenRecord),
-        this.program.account.trancheState.fetchNullable(pdas.trancheState)
-      ]);
-      const [liqsolPoolBalance, userLiqsolBalance] = await Promise.all([
-        this.getTokenBalance(pdas.liqsolPoolAta),
-        this.getTokenBalance(pdas.userAta)
-      ]);
-      return {
-        globalState,
-        outpostAccount,
-        distributionState,
-        trancheState,
-        userPretokenRecord,
-        liqsolPoolBalance,
-        userLiqsolBalance
-      };
-    } catch (err) {
-      console.error("Error fetching Outpost wire state:", err);
-      throw err;
-    }
+    const [
+      globalState,
+      outpostAccount,
+      distributionState,
+      userPretokenRecord,
+      trancheState,
+      liqsolPoolBalance,
+      userLiqsolBalance
+    ] = await Promise.all([
+      safeFetch(this.program.account.globalState.fetch(pdas.globalState), "globalState"),
+      safeFetch(this.program.account.outpostAccount.fetchNullable(pdas.outpostAccount), "outpostAccount"),
+      safeFetch(this.program.account.distributionState.fetchNullable(pdas.distributionState), "distributionState"),
+      safeFetch(this.program.account.userPretokenRecord.fetchNullable(pdas.userPretokenRecord), "userPretokenRecord"),
+      safeFetch(this.program.account.trancheState.fetchNullable(pdas.trancheState), "trancheState"),
+      safeFetch(this.getTokenBalance(pdas.liqsolPoolAta), "liqsolPoolAta"),
+      safeFetch(this.getTokenBalance(pdas.userAta), "userAta")
+    ]);
+    return {
+      globalState,
+      outpostAccount,
+      distributionState,
+      trancheState,
+      userPretokenRecord,
+      liqsolPoolBalance,
+      userLiqsolBalance
+    };
   }
   async buildStakeIx(amountLamports, user = this.wallet.publicKey) {
     if (!user) {
@@ -17051,9 +17050,9 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       throw err;
     }
   }
-  async getPortfolio() {
+  async getPortfolio(address) {
     try {
-      const user = !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
+      const user = address ? new PublicKey(address) : !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
       const reservePoolPDA = this.program.deriveReservePoolPda();
       const vaultPDA = this.program.deriveVaultPda();
       const liqsolMint = this.program.deriveLiqsolMintPda();
@@ -17078,6 +17077,14 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       const userPretokenRecord = snapshot?.userPretokenRecord ?? null;
       const stakedLiqsolStr = outpostAccount?.stakedLiqsol?.toString?.() ?? "0";
       const wirePretokensStr = userPretokenRecord?.totalPretokensPurchased?.toString?.() ?? "0";
+      console.log("userPretokenRecord", userPretokenRecord);
+      console.log("address", address);
+      console.log("userPretokenRecord?.totalPretokensPurchased?.toString", userPretokenRecord?.totalPretokensPurchased?.toString);
+      if (userPretokenRecord) {
+        for (const [key, value] of Object.entries(userPretokenRecord)) {
+          console.log(`userPretokenRecord.${key}: ${value?.toString?.() ?? value}`);
+        }
+      }
       const currentIndexStr = globalState?.currentIndex?.toString?.() ?? "0";
       const totalSharesStr = globalState?.totalShares?.toString?.() ?? "0";
       const userSharesStr = outpostAccount?.stakedShares?.toString?.() ?? "0";
@@ -42738,10 +42745,10 @@ class EthereumStakingClient {
     let result = await this.validatorClient.validatorDepositAndLockBond();
     return result && result.txHash ? result.txHash : "Error - no resulting txHash";
   }
-  async getPortfolio() {
+  async getPortfolio(address) {
     try {
       if (!this.signer) return Promise.resolve(null);
-      const walletAddress = await this.address;
+      const walletAddress = address ?? await this.address;
       const nativeBalance = await this.provider.getBalance(walletAddress);
       const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
       const nativeSymbol = this.network?.nativeCurrency?.symbol ?? "ETH";
@@ -43002,5 +43009,5 @@ var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
 
-export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, ConvertClient$1 as ConvertClient, DEFAULT_AVERAGE_PAY_RATE, DEFAULT_PAY_RATE_LOOKBACK, DistributionClient, EPHEMERAL_RENT_EXEMPTION, ERC1155Abi, ERC20Abi, ERC721Abi, types$1 as ETH, EthereumContractService, EthereumStakingClient, HOODI_ADDRESSES, INDEX_SCALE$1 as INDEX_SCALE, INITIAL_TRANCHE_SUPPLY, LAMPORTS_PER_SOL, LeaderboardClient, MAINNET_ADDRESSES, OutpostClient, PAY_RATE_SCALE_FACTOR, PDA_SEEDS, PROGRAM_IDS_BY_CHAIN, PurchaseAsset, ReceiptNFTKind, SCALE, types as SOL, SolanaStakingClient, Staker, SupportedEvmChainID, SupportedSolChainID, TokenClient, airdropSol, buildOutpostAccounts, buildSolanaTrancheLadder, buildSolanaTrancheSnapshot, ceilDiv, deriveEphemeralStakeAddress, generateRandomDepositAmount, generateTestKeypair, getEpochSnapshot, getErrorMessage, getProgramIds, lamportsToSol, msToEpochEnd, normalizeToBigInt, scheduledInstruction, sleep, solToLamports, toBigint, tokensToShares, waitForConfirmation, waitUntilSafeToExecuteFunction };
+export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, ConvertClient$1 as ConvertClient, DEFAULT_AVERAGE_PAY_RATE, DEFAULT_PAY_RATE_LOOKBACK, DistributionClient, EPHEMERAL_RENT_EXEMPTION, ERC1155Abi, ERC20Abi, ERC721Abi, types$1 as ETH, EthereumContractService, EthereumStakingClient, HOODI_ADDRESSES, INDEX_SCALE$1 as INDEX_SCALE, INITIAL_TRANCHE_SUPPLY, LAMPORTS_PER_SOL, LeaderboardClient, MAINNET_ADDRESSES, OutpostClient, PAY_RATE_SCALE_FACTOR, PDA_SEEDS, PROGRAM_IDS_BY_CHAIN, PurchaseAsset, ReceiptNFTKind, SCALE, types as SOL, SolanaStakingClient, Staker, SupportedEvmChainID, SupportedSolChainID, TokenClient, airdropSol, buildOutpostAccounts, buildSolanaTrancheLadder, buildSolanaTrancheSnapshot, ceilDiv, deriveEphemeralStakeAddress, generateRandomDepositAmount, generateTestKeypair, getEpochSnapshot, getErrorMessage, getProgramIds, lamportsToSol, msToEpochEnd, normalizeToBigInt, safeFetch, scheduledInstruction, sleep, solToLamports, toBigint, tokensToShares, waitForConfirmation, waitUntilSafeToExecuteFunction };
 //# sourceMappingURL=stake.browser.js.map