@wireio/stake 2.4.3 → 2.5.0

package/lib/stake.d.ts

@@ -46,7 +46,7 @@ interface IStakingClient {
     /** Enumerate withdrawal receipt NFTs held by the user (queued/ready/claimed). */
     getPendingWithdraws(address?: string): Promise<WithdrawReceipt$1[]>;
     /** Fetch the complete user portfolio */
-    getPortfolio(): Promise<Portfolio | null>;
+    getPortfolio(address?: string): Promise<Portfolio | null>;
     getSystemAPY(): Promise<number>;
     /**
      * Program-level prelaunch WIRE/tranche snapshot for this chain.
@@ -505,7 +505,7 @@ declare class EthereumStakingClient implements IStakingClient {
      * actual  = liqETH token balance (ERC-20)
      * tracked = liqETH tracked balance (protocol/accounting view)
      */
-    getPortfolio(): Promise<Portfolio | null>;
+    getPortfolio(address?: string): Promise<Portfolio | null>;
     /**
      * ETH Prelaunch function to list the Stake ReceiptNFTs owned by a specific user
      * @param address address to query the receipts for
@@ -784,7 +784,11 @@ type ParsedAccountInfo = {
  * fetching all relevant on-chain accounts for a given user.
  */
 type OutpostWireStateSnapshot = {
-    globalState: GlobalState;
+    /**
+     * Global Wire/outpost state.
+     * May be null if the fetch fails.
+     */
+    globalState: GlobalState | null;
     /**
      * Per-user Outpost account (old “wire receipt”), or null if user
      * hasn’t interacted yet.
@@ -804,10 +808,10 @@ type OutpostWireStateSnapshot = {
      * May be null if the user never purchased.
      */
     userPretokenRecord: UserPretokenRecord | null;
-    /** liqSOL in the pool ATA (Token-2022 raw amount) */
-    liqsolPoolBalance: BN;
-    /** liqSOL in the user’s ATA (Token-2022 raw amount) */
-    userLiqsolBalance: BN;
+    /** liqSOL in the pool ATA (Token-2022 raw amount), or null on fetch failure */
+    liqsolPoolBalance: BN | null;
+    /** liqSOL in the user’s ATA (Token-2022 raw amount), or null on fetch failure */
+    userLiqsolBalance: BN | null;
 };
 /**
  * ============================================================
@@ -16660,6 +16664,7 @@ interface ScheduleConfig {
 }
 declare function ceilDiv(n: BN, d: BN): BN;
 declare function normalizeToBigInt(x: any): bigint;
+declare const safeFetch: <T>(promise: Promise<T>, label?: string) => Promise<T | null>;
 
 /**
  * OutpostClient
@@ -16868,7 +16873,7 @@ declare class SolanaStakingClient implements IStakingClient {
      *  - yield: on-chain index/shares plus an estimated accrued liqSOL yield
      *  - extras: useful internal addresses and raw state for debugging/UX
      */
-    getPortfolio(): Promise<Portfolio>;
+    getPortfolio(address?: string): Promise<Portfolio>;
     /**
      * Convenience helper to fetch the distribution userRecord for the current user.
      * Used by balance-correction flows and debugging.
@@ -16979,5 +16984,5 @@ declare class SolanaStakingClient implements IStakingClient {
     private getSingleTxFeeLamports;
 }
 
-export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, 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, 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, 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, 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 };
 export type { BalanceView, ChainSymbol, ContractConfig, ContractOptions, Contracts, EpochSnapshot, IStakingClient, OPPAssertion, OutpostAccounts, Portfolio, PurchaseQuote, ScheduleConfig, SolanaProgramIds, SquadsXConfig, StakerConfig, TrancheLadderItem, TrancheSnapshot, WithdrawReceipt$1 as WithdrawReceipt, WithdrawStatus, YieldView };

package/lib/stake.js

@@ -15915,6 +15915,14 @@ function normalizeToBigInt(x) {
   if (typeof x === "number") return BigInt(x);
   throw new Error(`normalizeToBigInt: unsupported type ${typeof x}`);
 }
+const safeFetch = (promise, label) => __async$g(null, null, function* () {
+  try {
+    return yield promise;
+  } catch (err) {
+    console.error(`Safe Fetch Failed${label ? ` (${label})` : ""}:`, err);
+    return null;
+  }
+});
 
 var __pow = Math.pow;
 var __async$f = (__this, __arguments, generator) => {
@@ -16169,10 +16177,12 @@ let ConvertClient$1 = class ConvertClient {
       }
       let slotTimeSec = 0.4;
       try {
-        const samples = yield conn.getRecentPerformanceSamples(1);
+        const samples = yield conn.getRecentPerformanceSamples(60);
         if (samples == null ? void 0 : 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 (_) {
       }
@@ -16565,52 +16575,41 @@ class OutpostClient {
   }
   getTokenBalance(ata) {
     return __async$c(this, null, function* () {
-      try {
-        const bal = yield this.connection.getTokenAccountBalance(ata);
-        return new anchor.BN(bal.value.amount);
-      } catch (e) {
-        return new anchor.BN(0);
-      }
+      const bal = yield this.connection.getTokenAccountBalance(ata);
+      return new anchor.BN(bal.value.amount);
     });
   }
   fetchWireState(user) {
     return __async$c(this, null, function* () {
       const userPk = user != null ? 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 = yield this.buildAccounts(userPk);
-      try {
-        const [
-          globalState,
-          outpostAccount,
-          distributionState,
-          userPretokenRecord,
-          trancheState
-        ] = yield 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] = yield 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
+      ] = yield 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
+      };
     });
   }
   buildStakeIx(_0) {
@@ -17382,11 +17381,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       }
     });
   }
-  getPortfolio() {
+  getPortfolio(address) {
     return __async$9(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
       try {
-        const user = !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
+        const user = address ? new web3_js.PublicKey(address) : !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
         const reservePoolPDA = this.program.deriveReservePoolPda();
         const vaultPDA = this.program.deriveVaultPda();
         const liqsolMint = this.program.deriveLiqsolMintPda();
@@ -17411,9 +17410,17 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         const userPretokenRecord = (_f = snapshot == null ? void 0 : snapshot.userPretokenRecord) != null ? _f : null;
         const stakedLiqsolStr = (_i = (_h = (_g = outpostAccount == null ? void 0 : outpostAccount.stakedLiqsol) == null ? void 0 : _g.toString) == null ? void 0 : _h.call(_g)) != null ? _i : "0";
         const wirePretokensStr = (_l = (_k = (_j = userPretokenRecord == null ? void 0 : userPretokenRecord.totalPretokensPurchased) == null ? void 0 : _j.toString) == null ? void 0 : _k.call(_j)) != null ? _l : "0";
-        const currentIndexStr = (_o = (_n = (_m = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _m.toString) == null ? void 0 : _n.call(_m)) != null ? _o : "0";
-        const totalSharesStr = (_r = (_q = (_p = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _p.toString) == null ? void 0 : _q.call(_p)) != null ? _r : "0";
-        const userSharesStr = (_u = (_t = (_s = outpostAccount == null ? void 0 : outpostAccount.stakedShares) == null ? void 0 : _s.toString) == null ? void 0 : _t.call(_s)) != null ? _u : "0";
+        console.log("userPretokenRecord", userPretokenRecord);
+        console.log("address", address);
+        console.log("userPretokenRecord?.totalPretokensPurchased?.toString", (_m = userPretokenRecord == null ? void 0 : userPretokenRecord.totalPretokensPurchased) == null ? void 0 : _m.toString);
+        if (userPretokenRecord) {
+          for (const [key, value] of Object.entries(userPretokenRecord)) {
+            console.log(`userPretokenRecord.${key}: ${(_o = (_n = value == null ? void 0 : value.toString) == null ? void 0 : _n.call(value)) != null ? _o : value}`);
+          }
+        }
+        const currentIndexStr = (_r = (_q = (_p = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _p.toString) == null ? void 0 : _q.call(_p)) != null ? _r : "0";
+        const totalSharesStr = (_u = (_t = (_s = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _s.toString) == null ? void 0 : _t.call(_s)) != null ? _u : "0";
+        const userSharesStr = (_x = (_w = (_v = outpostAccount == null ? void 0 : outpostAccount.stakedShares) == null ? void 0 : _v.toString) == null ? void 0 : _w.call(_v)) != null ? _x : "0";
         const stakedLiqsol = BigInt(stakedLiqsolStr);
         const currentIndex = BigInt(currentIndexStr);
         const totalShares = BigInt(totalSharesStr);
@@ -17466,10 +17473,10 @@ const _SolanaStakingClient = class _SolanaStakingClient {
             userLiqsolAta: userLiqsolAta.toBase58(),
             reservePoolPDA: reservePoolPDA.toBase58(),
             vaultPDA: vaultPDA.toBase58(),
-            globalIndex: (_v = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _v.toString(),
-            totalShares: (_w = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _w.toString(),
-            currentTrancheNumber: (_x = trancheState == null ? void 0 : trancheState.currentTrancheNumber) == null ? void 0 : _x.toString(),
-            currentTranchePriceUsd: (_y = trancheState == null ? void 0 : trancheState.currentTranchePriceUsd) == null ? void 0 : _y.toString()
+            globalIndex: (_y = globalState == null ? void 0 : globalState.currentIndex) == null ? void 0 : _y.toString(),
+            totalShares: (_z = globalState == null ? void 0 : globalState.totalShares) == null ? void 0 : _z.toString(),
+            currentTrancheNumber: (_A = trancheState == null ? void 0 : trancheState.currentTrancheNumber) == null ? void 0 : _A.toString(),
+            currentTranchePriceUsd: (_B = trancheState == null ? void 0 : trancheState.currentTranchePriceUsd) == null ? void 0 : _B.toString()
           },
           chainID: this.network.chainId
         };
@@ -43364,12 +43371,12 @@ class EthereumStakingClient {
       return result && result.txHash ? result.txHash : "Error - no resulting txHash";
     });
   }
-  getPortfolio() {
+  getPortfolio(address) {
     return __async(this, null, function* () {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       try {
         if (!this.signer) return Promise.resolve(null);
-        const walletAddress = yield this.address;
+        const walletAddress = address != null ? address : yield this.address;
         const nativeBalance = yield this.provider.getBalance(walletAddress);
         const nativeDecimals = (_c = (_b = (_a = this.network) == null ? void 0 : _a.nativeCurrency) == null ? void 0 : _b.decimals) != null ? _c : 18;
         const nativeSymbol = (_f = (_e = (_d = this.network) == null ? void 0 : _d.nativeCurrency) == null ? void 0 : _e.symbol) != null ? _f : "ETH";
@@ -43697,6 +43704,7 @@ exports.getProgramIds = getProgramIds;
 exports.lamportsToSol = lamportsToSol;
 exports.msToEpochEnd = msToEpochEnd;
 exports.normalizeToBigInt = normalizeToBigInt;
+exports.safeFetch = safeFetch;
 exports.scheduledInstruction = scheduledInstruction;
 exports.sleep = sleep;
 exports.solToLamports = solToLamports;