@wireio/stake 2.4.3 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wireio/stake",
-    "version": "2.4.3",
+    "version": "2.5.0",
     "description": "LIQ Staking Module for Wire Network",
     "homepage": "https://gitea.gitgo.app/Wire/sdk-stake",
     "license": "FSL-1.1-Apache-2.0",

package/src/networks/ethereum/ethereum.ts

@@ -202,12 +202,12 @@ export class EthereumStakingClient implements IStakingClient {
      * actual  = liqETH token balance (ERC-20)
      * tracked = liqETH tracked balance (protocol/accounting view)
      */
-    async getPortfolio(): Promise<Portfolio | null> {
+    async getPortfolio(address?: string): Promise<Portfolio | null> {
 
         try {
             if (!this.signer) return Promise.resolve(null);
 
-            const walletAddress = await this.address!;
+            const walletAddress = address ?? await this.address!;
 
             // 1) Native ETH balance
             const nativeBalance = await this.provider.getBalance(walletAddress);

package/src/networks/solana/clients/convert.client.ts

@@ -316,10 +316,12 @@ export 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 (_) {
             // ignore

package/src/networks/solana/clients/outpost.client.ts

@@ -14,6 +14,7 @@ import { LiqsolCore } from '../../../assets/solana/devnet/types/liqsol_core';
 import {
     OutpostAccounts,
     buildOutpostAccounts,
+    safeFetch,
 } from '../utils';
 
 import {
@@ -74,12 +75,8 @@ export class OutpostClient {
      * Internal helper: get raw token balance (BN) for a given ATA.
      */
     private async getTokenBalance(ata: PublicKey): Promise<BN> {
-        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);
     }
 
     /**
@@ -87,48 +84,40 @@ export class OutpostClient {
      */
     async fetchWireState(user?: PublicKey): Promise<OutpostWireStateSnapshot> {
         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);
+        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'),
+        ]);
 
-        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;
-        }
+        return {
+            globalState,
+            outpostAccount,
+            distributionState,
+            trancheState,
+            userPretokenRecord,
+            liqsolPoolBalance,
+            userLiqsolBalance,
+        };
     }
 
+
+
     // -------------------------------------------------------------------------
     // Outpost stake / unstake builders (synd / desynd)
     // -------------------------------------------------------------------------
@@ -301,4 +290,4 @@ export class OutpostClient {
         const decPart = valueStr.slice(valueStr.length - decimals);
         return `${intPart}.${decPart}`;
     }
-}
+}

package/src/networks/solana/solana.ts

@@ -389,10 +389,11 @@ export 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
      */
-    async getPortfolio(): Promise<Portfolio> {
+    async getPortfolio(address?: string): Promise<Portfolio> {
         // if (!this.pubKey) throw new Error('User pubKey is undefined');
         try {
-            const user = !!this.squadsX ? this.squadsVaultPDA! : this.solPubKey;
+            const user = address ? new SolPubKey(address) : 
+                !!this.squadsX ? this.squadsVaultPDA! : this.solPubKey;
 
             const reservePoolPDA = this.program.deriveReservePoolPda();
             const vaultPDA = this.program.deriveVaultPda();
@@ -444,6 +445,15 @@ export class SolanaStakingClient implements IStakingClient {
                 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}`);
+                }
+            }
+
             // -----------------------------
             //  Yield view (index + shares)
             // -----------------------------

package/src/networks/solana/types.ts

@@ -34,7 +34,11 @@ export type ParsedAccountInfo = {
  */
 
 export 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
@@ -60,11 +64,11 @@ export type OutpostWireStateSnapshot = {
     userPretokenRecord: UserPretokenRecord | null;
 
     // Balances
-    /** liqSOL in the pool ATA (Token-2022 raw amount) */
-    liqsolPoolBalance: 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) */
-    userLiqsolBalance: BN;
+    /** liqSOL in the user’s ATA (Token-2022 raw amount), or null on fetch failure */
+    userLiqsolBalance: BN | null;
 };
 
 /**
@@ -750,4 +754,4 @@ export type ReceiptData = {
 
     /** Flag indicating whether this receipt has been fulfilled/claimed (bool) */
     fulfilled: boolean;
-};
+};

package/src/networks/solana/utils.ts

@@ -562,3 +562,11 @@ export function normalizeToBigInt(x: any): bigint {
     if (typeof x === 'number') return BigInt(x);
     throw new Error(`normalizeToBigInt: unsupported type ${typeof x}`);
 }
+
+export const safeFetch = async <T>(promise: Promise<T>, label?: string): Promise<T | null> => {
+    try { return await promise; }
+    catch (err) {
+        console.error(`Safe Fetch Failed${label ? ` (${label})` : ''}:`,err);
+        return null;
+    }
+};

package/src/types.ts

@@ -50,7 +50,7 @@ export interface IStakingClient {
     getPendingWithdraws(address?: string): Promise<WithdrawReceipt[]>
 
     /** Fetch the complete user portfolio */
-    getPortfolio(): Promise<Portfolio | null>;
+    getPortfolio(address?: string): Promise<Portfolio | null>;
 
     // Estimated total APY for staking yeild
     getSystemAPY(): Promise<number>;