@wireio/stake 0.7.3 → 0.9.1

package/src/networks/solana/solana.ts

@@ -7,17 +7,23 @@ import {
     PublicKey as SolPubKey,
     SystemProgram,
     Transaction,
+    TransactionInstruction,
+    TransactionMessage,
     TransactionSignature,
 } from '@solana/web3.js';
 import { AnchorProvider, BN } from '@coral-xyz/anchor';
 import { BaseSignerWalletAdapter } from '@solana/wallet-adapter-base';
 import {
     ASSOCIATED_TOKEN_PROGRAM_ID,
+    createAssociatedTokenAccountInstruction,
     getAssociatedTokenAddressSync,
     TOKEN_2022_PROGRAM_ID,
 } from '@solana/spl-token';
 
+import * as multisig from "@sqds/multisig";
+
 import {
+    Base58,
     ChainID,
     ExternalNetwork,
     KeyType,
@@ -28,6 +34,7 @@ import {
 import {
     IStakingClient,
     Portfolio,
+    SquadsXConfig,
     StakerConfig,
     TrancheSnapshot,
 } from '../../types';
@@ -50,6 +57,7 @@ import {
 import { buildSolanaTrancheSnapshot, ceilDiv } from './utils';
 import { GlobalConfig, PayRateEntry, SolanaTransaction } from './types';
 import { SolanaProgramService } from './program';
+import bs58 from 'bs58';
 
 const commitment: Commitment = 'confirmed';
 
@@ -78,6 +86,9 @@ export class SolanaStakingClient implements IStakingClient {
     public tokenClient: TokenClient;
     public program: SolanaProgramService
 
+    private smartAccount?: SolPubKey; // PDA (off-curve)
+    private signer?: SolPubKey;       // on-curve signer
+
     get solPubKey(): SolPubKey {
         if (!this.pubKey) throw new Error('pubKey is undefined');
         return new SolPubKey(this.pubKey.data.array);
@@ -87,6 +98,18 @@ export class SolanaStakingClient implements IStakingClient {
         return this.config.network;
     }
 
+    get feePayer(): SolPubKey {
+        if (this.signer) return this.signer;
+        // fallback for normal wallets
+        if (this.anchor.wallet.publicKey) return this.anchor.wallet.publicKey;
+        throw new Error('No signing authority available');
+    }
+
+    get squadsX(): SquadsXConfig | null {
+        const config = this.config.extras?.squadsX;
+        return config ?? null;
+    }
+
     constructor(private config: StakerConfig) {
         const adapter = config.provider as BaseSignerWalletAdapter | undefined;
 
@@ -197,6 +220,83 @@ export class SolanaStakingClient implements IStakingClient {
     // IStakingClient core methods
     // ---------------------------------------------------------------------
 
+
+    async createVaultLiqsolAtaOneShot(params: {
+        connection: Connection;
+        payer: SolPubKey;      // user's wallet pubkey (signer)
+        vaultPda: SolPubKey;   // squads vault PDA (off-curve owner)
+    }): Promise<{ tx: Transaction; vaultAta: SolPubKey } | null> {
+        const { connection, payer, vaultPda } = params;
+
+        const liqsolMint = deriveLiqsolMintPda();
+
+        const vaultAta = getAssociatedTokenAddressSync(
+            liqsolMint,
+            vaultPda,
+            true, // allowOwnerOffCurve
+            TOKEN_2022_PROGRAM_ID,
+            ASSOCIATED_TOKEN_PROGRAM_ID,
+        );
+
+        // If it already exists, just no-op
+        const info = await connection.getAccountInfo(vaultAta, "confirmed");
+        console.log('info?', info);
+
+        if (info) return null;
+
+        const ix = createAssociatedTokenAccountInstruction(
+            payer,      // payer = user
+            vaultAta,   // ata address
+            vaultPda,   // owner = vault
+            liqsolMint,
+            TOKEN_2022_PROGRAM_ID,
+            ASSOCIATED_TOKEN_PROGRAM_ID,
+        );
+
+        const tx = new Transaction().add(ix);
+        return { tx, vaultAta };
+    }
+
+    private async prepSquadsIxs(ix: TransactionInstruction): Promise<TransactionInstruction[]> {
+        if (!this.squadsX) throw new Error('Attempting to wrap Squads instruction without SquadsX config');
+
+        const multisigPda = this.squadsMultisigPDA!;
+        const vaultPda = this.squadsVaultPDA!;
+        const vaultIndex = this.squadsX?.vaultIndex ?? 0;
+        const creator = this.solPubKey;
+
+        // compute next transactionIndex 
+        const ms = await multisig.accounts.Multisig.fromAccountAddress(this.connection, multisigPda);
+        const current = BigInt(ms.transactionIndex?.toString() ?? 0);
+        const transactionIndex = current + BigInt(1);
+
+        // inner message uses vault as payer
+        // const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 });
+        const { blockhash } = await this.connection.getLatestBlockhash("confirmed");
+        const transactionMessage = new TransactionMessage({
+            payerKey: vaultPda,
+            recentBlockhash: blockhash,
+            instructions: [ix],
+        });
+
+        const createVaultTxIx = await multisig.instructions.vaultTransactionCreate({
+            multisigPda,
+            transactionIndex,
+            creator,
+            vaultIndex,
+            transactionMessage,
+            ephemeralSigners: 0,
+        });
+
+        const createProposalIx = await multisig.instructions.proposalCreate({
+            multisigPda,
+            transactionIndex,
+            creator,
+        });
+
+        return [createVaultTxIx, createProposalIx];
+    }
+
     /**
      * Deposit native SOL into liqSOL (liqsol_core::deposit).
      * Handles tx build, sign, send, and confirmation.
@@ -207,14 +307,55 @@ export class SolanaStakingClient implements IStakingClient {
             throw new Error('Deposit amount must be greater than zero.');
         }
 
-        const tx = await this.depositClient.buildDepositTx(amountLamports);
-        const { tx: prepared, blockhash, lastValidBlockHeight } =
-            await this.prepareTx(tx);
-        const signed = await this.signTransaction(prepared);
-        return await this.sendAndConfirmHttp(signed, {
-            blockhash,
-            lastValidBlockHeight,
-        });
+        try {
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+            // console.log('amountLamports', amountLamports);
+
+            if (!!this.squadsX) {
+
+                const createVaultTx = await this.createVaultLiqsolAtaOneShot({
+                    connection: this.connection,
+                    payer: this.solPubKey,
+                    vaultPda: this.squadsVaultPDA!,
+                })
+
+                if (createVaultTx !== null) {
+                    console.log('need to create vault ata first...');
+                    const tx0 = new Transaction().add(createVaultTx.tx);
+                    const prepared0 = await this.prepareTx(tx0);
+                    const signed0 = await this.signTransaction(prepared0.tx);
+                    const sent0 = await this.sendAndConfirmHttp(signed0, prepared0);
+                    console.log('create Vault ATA', sent0);
+                }
+
+                const ix = await this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA!)
+                const squadIxs = await this.prepSquadsIxs(ix)
+
+                const tx1 = new Transaction().add(cuIx, squadIxs[0]);
+                const prepared1 = await this.prepareTx(tx1);
+                const signed1 = await this.signTransaction(prepared1.tx);
+                const sent1 = await this.sendAndConfirmHttp(signed1, prepared1);
+                console.log('SENT 1', sent1);
+
+                const tx2 = new Transaction().add(cuIx, squadIxs[1]);
+                const prepared2 = await this.prepareTx(tx2);
+                const signed2 = await this.signTransaction(prepared2.tx);
+                const sent2 = await this.sendAndConfirmHttp(signed2, prepared2);
+                console.log('SENT 2', sent2);
+
+                return sent2;
+            }
+            else {
+                const ix = await this.depositClient.buildDepositTx(amountLamports)
+                const tx = new Transaction().add(ix);
+                const prepared = await this.prepareTx(tx);
+                const signed = await this.signTransaction(prepared.tx);
+
+                return this.sendAndConfirmHttp(signed, prepared);
+            }
+        } catch (err) {
+            throw new Error(`Failed to deposit Solana: ${err}`);
+        }
     }
 
     /**
@@ -233,14 +374,22 @@ export class SolanaStakingClient implements IStakingClient {
             throw new Error('Withdraw amount must be greater than zero.');
         }
 
-        const tx = await this.depositClient.buildWithdrawTx(amountLamports);
-        const { tx: prepared, blockhash, lastValidBlockHeight } =
-            await this.prepareTx(tx);
-        const signed = await this.signTransaction(prepared);
-        return await this.sendAndConfirmHttp(signed, {
-            blockhash,
-            lastValidBlockHeight,
-        });
+        try {
+            // Build compute budget increase instruction
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+
+            // Build the Outpost synd instruction
+            const ix = await this.depositClient.buildWithdrawTx(amountLamports);
+
+            // Wrap in a transaction and send
+            const tx = new Transaction().add(cuIx, ix);
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
+
+            return this.sendAndConfirmHttp(signed, prepared);
+        } catch (err) {
+            throw new Error(`Failed to withdraw Solana: ${err}`);
+        }
     }
 
     /**
@@ -253,20 +402,24 @@ export class SolanaStakingClient implements IStakingClient {
             throw new Error('Stake amount must be greater than zero.');
         }
 
-        const user = this.solPubKey;
+        try {
+            const user = this.solPubKey;
 
-        // Build compute budget increase instruction
-        const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+            // Build compute budget increase instruction
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
 
-        // Build the Outpost synd instruction
-        const ix = await this.outpostClient.buildStakeIx(amountLamports, user);
+            // Build the Outpost synd instruction
+            const ix = await this.outpostClient.buildStakeIx(amountLamports, user);
 
-        // Wrap in a transaction and send
-        const tx = new Transaction().add(cuIx, ix);
-        const prepared = await this.prepareTx(tx);
-        const signed = await this.signTransaction(prepared.tx);
+            // Wrap in a transaction and send
+            const tx = new Transaction().add(cuIx, ix);
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
 
-        return this.sendAndConfirmHttp(signed, prepared);
+            return this.sendAndConfirmHttp(signed, prepared);
+        } catch (err) {
+            throw new Error(`Failed to stake Solana: ${err}`);
+        }
     }
 
     /**
@@ -279,20 +432,25 @@ export class SolanaStakingClient implements IStakingClient {
             throw new Error('Unstake amount must be greater than zero.');
         }
 
-        const user = this.solPubKey;
+        try {
+            const user = this.solPubKey;
 
-        // Build compute budget increase instruction
-        const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+            // Build compute budget increase instruction
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
 
-        // Build the Outpost desynd instruction
-        const ix = await this.outpostClient.buildUnstakeIx(amountLamports, user);
+            // Build the Outpost desynd instruction
+            const ix = await this.outpostClient.buildUnstakeIx(amountLamports, user);
 
-        // Wrap in a transaction and send
-        const tx = new Transaction().add(cuIx, ix);
-        const prepared = await this.prepareTx(tx);
-        const signed = await this.signTransaction(prepared.tx);
+            // Wrap in a transaction and send
+            const tx = new Transaction().add(cuIx, ix);
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
 
-        return this.sendAndConfirmHttp(signed, prepared);
+            return this.sendAndConfirmHttp(signed, prepared);
+        }
+        catch (err) {
+            throw new Error(`Failed to unstake Solana: ${err}`);
+        }
     }
 
     /**
@@ -307,17 +465,20 @@ export class SolanaStakingClient implements IStakingClient {
             throw new Error('liqSOL pretoken purchase requires a positive amount.');
         }
 
-        const user = this.solPubKey;
-        const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
-        const ix = await this.tokenClient.buildPurchaseIx(amountLamports, user);
-        const tx = new Transaction().add(cuIx, ix);
-        const { tx: prepared, blockhash, lastValidBlockHeight } =
-            await this.prepareTx(tx);
-        const signed = await this.signTransaction(prepared);
-        return await this.sendAndConfirmHttp(signed, {
-            blockhash,
-            lastValidBlockHeight,
-        });
+        try {
+            const user = this.solPubKey;
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+            const ix = await this.tokenClient.buildPurchaseIx(amountLamports, user);
+
+            const tx = new Transaction().add(cuIx, ix);
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
+
+            return this.sendAndConfirmHttp(signed, prepared);
+        }
+        catch (err) {
+            throw new Error(`Failed to buy liqSOL pretokens: ${err}`);
+        }
     }
 
     /**
@@ -332,140 +493,147 @@ export class SolanaStakingClient implements IStakingClient {
     async getPortfolio(): Promise<Portfolio> {
         if (!this.pubKey) throw new Error('User pubKey is undefined');
 
-        const user = this.solPubKey;
+        try {
+            const user = !!this.squadsX ? this.squadsVaultPDA! : this.solPubKey;
 
-        const reservePoolPDA = deriveReservePoolPda();
-        const vaultPDA = deriveVaultPda();
-        const liqsolMint = deriveLiqsolMintPda();
+            console.log('get portfolio for user', user.toBase58());
 
-        const userLiqsolAta = getAssociatedTokenAddressSync(
-            liqsolMint,
-            user,
-            false,
-            TOKEN_2022_PROGRAM_ID,
-            ASSOCIATED_TOKEN_PROGRAM_ID,
-        );
+            const reservePoolPDA = deriveReservePoolPda();
+            const vaultPDA = deriveVaultPda();
+            const liqsolMint = deriveLiqsolMintPda();
 
-        // NOTE:
-        //  - nativeLamports: wallet SOL
-        //  - actualBalResp: liqSOL balance in user ATA
-        //  - snapshot: Outpost + pretokens + global index/shares
-        const [nativeLamports, actualBalResp, snapshot] = await Promise.all([
-            this.connection.getBalance(user, 'confirmed'),
-            this.connection
-                .getTokenAccountBalance(userLiqsolAta, 'confirmed')
-                .catch(() => null),
-            this.outpostClient.fetchWireState(user).catch(() => null),
-        ]);
+            const userLiqsolAta = getAssociatedTokenAddressSync(
+                liqsolMint,
+                user,
+                true,   //set to true to allow off curve (e.g. PDA for squadsx wallet)
+                TOKEN_2022_PROGRAM_ID,
+                ASSOCIATED_TOKEN_PROGRAM_ID,
+            );
 
-        const LIQSOL_DECIMALS = 9;
-
-        const actualAmountStr = actualBalResp?.value?.amount ?? '0';
-
-        const globalState = snapshot?.globalState ?? null;
-        const outpostAccount = snapshot?.outpostAccount ?? null;
-        const trancheState = snapshot?.trancheState ?? null;
-        const userPretokenRecord = snapshot?.userPretokenRecord ?? null;
-
-        // -----------------------------
-        //  Staked liqSOL (Outpost)
-        // -----------------------------
-        // This is the liqSOL that has been syndicated into Outpost via `synd`.
-        // It lives on the outpost account as `stakedLiqsol`.
-        const stakedLiqsolStr =
-            outpostAccount?.stakedLiqsol?.toString?.() ?? '0';
-
-        // -----------------------------
-        //  WIRE pretokens (1e8 scale)
-        // -----------------------------
-        // This is NOT stake — it’s the prelaunch WIRE position.
-        const wirePretokensStr =
-            userPretokenRecord?.totalPretokensPurchased?.toString?.() ??
-            '0';
-
-        // -----------------------------
-        //  Yield view (index + shares)
-        // -----------------------------
-        // We expose:
-        //  - currentIndex: globalState.currentIndex (1e12 scale)
-        //  - totalShares:  globalState.totalShares
-        //  - userShares:   outpostAccount.stakedShares
-        //  - estimatedClaimLiqsol: floor(userShares * index / INDEX_SCALE)
-        //  - estimatedYield: max(0, estimatedClaim - stakedLiqsol)
-        //
-        // This matches the capital-staking math:
-        //   sharesToTokens(shares, index) = shares * index / INDEX_SCALE
-        const currentIndexStr =
-            globalState?.currentIndex?.toString?.() ?? '0';
-        const totalSharesStr =
-            globalState?.totalShares?.toString?.() ?? '0';
-        const userSharesStr =
-            outpostAccount?.stakedShares?.toString?.() ?? '0';
-
-        const stakedLiqsol = BigInt(stakedLiqsolStr);
-        const currentIndex = BigInt(currentIndexStr);
-        const totalShares = BigInt(totalSharesStr);
-        const userShares = BigInt(userSharesStr);
-
-        let estimatedClaim = BigInt(0);
-        let estimatedYield = BigInt(0);
-
-        if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
-            // sharesToTokens(userShares, currentIndex)
-            estimatedClaim = (userShares * currentIndex) / INDEX_SCALE;
-
-            if (estimatedClaim > stakedLiqsol) {
-                estimatedYield = estimatedClaim - stakedLiqsol;
+            // NOTE:
+            //  - nativeLamports: wallet SOL
+            //  - actualBalResp: liqSOL balance in user ATA
+            //  - snapshot: Outpost + pretokens + global index/shares
+            const [nativeLamports, actualBalResp, snapshot] = await Promise.all([
+                this.connection.getBalance(user, 'confirmed'),
+                this.connection
+                    .getTokenAccountBalance(userLiqsolAta, 'confirmed')
+                    .catch(() => null),
+                this.outpostClient.fetchWireState(user).catch(() => null),
+            ]);
+
+            const LIQSOL_DECIMALS = 9;
+
+            const actualAmountStr = actualBalResp?.value?.amount ?? '0';
+
+            const globalState = snapshot?.globalState ?? null;
+            const outpostAccount = snapshot?.outpostAccount ?? null;
+            const trancheState = snapshot?.trancheState ?? null;
+            const userPretokenRecord = snapshot?.userPretokenRecord ?? null;
+
+            // -----------------------------
+            //  Staked liqSOL (Outpost)
+            // -----------------------------
+            // This is the liqSOL that has been syndicated into Outpost via `synd`.
+            // It lives on the outpost account as `stakedLiqsol`.
+            const stakedLiqsolStr =
+                outpostAccount?.stakedLiqsol?.toString?.() ?? '0';
+
+            // -----------------------------
+            //  WIRE pretokens (1e8 scale)
+            // -----------------------------
+            // This is NOT stake — it’s the prelaunch WIRE position.
+            const wirePretokensStr =
+                userPretokenRecord?.totalPretokensPurchased?.toString?.() ??
+                '0';
+
+            // -----------------------------
+            //  Yield view (index + shares)
+            // -----------------------------
+            // We expose:
+            //  - currentIndex: globalState.currentIndex (1e12 scale)
+            //  - totalShares:  globalState.totalShares
+            //  - userShares:   outpostAccount.stakedShares
+            //  - estimatedClaimLiqsol: floor(userShares * index / INDEX_SCALE)
+            //  - estimatedYield: max(0, estimatedClaim - stakedLiqsol)
+            //
+            // This matches the capital-staking math:
+            //   sharesToTokens(shares, index) = shares * index / INDEX_SCALE
+            const currentIndexStr =
+                globalState?.currentIndex?.toString?.() ?? '0';
+            const totalSharesStr =
+                globalState?.totalShares?.toString?.() ?? '0';
+            const userSharesStr =
+                outpostAccount?.stakedShares?.toString?.() ?? '0';
+
+            const stakedLiqsol = BigInt(stakedLiqsolStr);
+            const currentIndex = BigInt(currentIndexStr);
+            const totalShares = BigInt(totalSharesStr);
+            const userShares = BigInt(userSharesStr);
+
+            let estimatedClaim = BigInt(0);
+            let estimatedYield = BigInt(0);
+
+            if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
+                // sharesToTokens(userShares, currentIndex)
+                estimatedClaim = (userShares * currentIndex) / INDEX_SCALE;
+
+                if (estimatedClaim > stakedLiqsol) {
+                    estimatedYield = estimatedClaim - stakedLiqsol;
+                }
             }
-        }
 
-        return {
-            native: {
-                amount: BigInt(nativeLamports),
-                symbol: 'SOL',
-                decimals: 9,
-            },
-            liq: {
-                amount: BigInt(actualAmountStr),
-                symbol: 'LiqSOL',
-                decimals: LIQSOL_DECIMALS,
-                ata: userLiqsolAta,
-            },
-            staked: {
-                // liqSOL staked in Outpost via `synd`
-                amount: stakedLiqsol,
-                symbol: 'LiqSOL',
-                decimals: LIQSOL_DECIMALS,
-            },
-            wire: {
-                // Prelaunch WIRE pretokens (1e8 scale)
-                amount: BigInt(wirePretokensStr),
-                symbol: '$WIRE',
-                decimals: 8,
-            },
-            yield: {
-                // Raw primitives so the frontend can display curves, charts, etc.
-                currentIndex,
-                indexScale: INDEX_SCALE,
-                totalShares,
-                userShares,
-                // liqSOL amounts (lamports) implied by index/shares
-                estimatedClaim,
-                estimatedYield,
-            },
-            extras: {
-                userLiqsolAta: userLiqsolAta.toBase58(),
-                reservePoolPDA: reservePoolPDA.toBase58(),
-                vaultPDA: vaultPDA.toBase58(),
-                globalIndex: globalState?.currentIndex?.toString(),
-                totalShares: globalState?.totalShares?.toString(),
-                currentTrancheNumber:
-                    trancheState?.currentTrancheNumber?.toString(),
-                currentTranchePriceUsd:
-                    trancheState?.currentTranchePriceUsd?.toString(), // 1e8 USD
-            },
-            chainID: this.network.chainId,
-        };
+            return {
+                native: {
+                    amount: BigInt(nativeLamports),
+                    symbol: 'SOL',
+                    decimals: 9,
+                },
+                liq: {
+                    amount: BigInt(actualAmountStr),
+                    symbol: 'LiqSOL',
+                    decimals: LIQSOL_DECIMALS,
+                    ata: userLiqsolAta,
+                },
+                staked: {
+                    // liqSOL staked in Outpost via `synd`
+                    amount: stakedLiqsol,
+                    symbol: 'LiqSOL',
+                    decimals: LIQSOL_DECIMALS,
+                },
+                wire: {
+                    // Prelaunch WIRE pretokens (1e8 scale)
+                    amount: BigInt(wirePretokensStr),
+                    symbol: '$WIRE',
+                    decimals: 8,
+                },
+                yield: {
+                    // Raw primitives so the frontend can display curves, charts, etc.
+                    currentIndex,
+                    indexScale: INDEX_SCALE,
+                    totalShares,
+                    userShares,
+                    // liqSOL amounts (lamports) implied by index/shares
+                    estimatedClaim,
+                    estimatedYield,
+                },
+                extras: {
+                    userLiqsolAta: userLiqsolAta.toBase58(),
+                    reservePoolPDA: reservePoolPDA.toBase58(),
+                    vaultPDA: vaultPDA.toBase58(),
+                    globalIndex: globalState?.currentIndex?.toString(),
+                    totalShares: globalState?.totalShares?.toString(),
+                    currentTrancheNumber:
+                        trancheState?.currentTrancheNumber?.toString(),
+                    currentTranchePriceUsd:
+                        trancheState?.currentTranchePriceUsd?.toString(), // 1e8 USD
+                },
+                chainID: this.network.chainId,
+            };
+        }
+        catch (err) {
+            throw new Error(`Failed to get Solana portfolio: ${err}`);
+        }
     }
 
     /**
@@ -477,6 +645,21 @@ export class SolanaStakingClient implements IStakingClient {
         return this.distributionClient.getUserRecord(this.solPubKey);
     }
 
+    // ---------------------------------------------------------------------
+    // SquadsX Helpers
+    // ---------------------------------------------------------------------
+
+    get squadsMultisigPDA(): SolPubKey | null {
+        if (!this.squadsX) return null;
+        return new SolPubKey(this.squadsX.multisigPDA);
+    }
+    get squadsVaultPDA(): SolPubKey | null {
+        if (!this.squadsX || !this.squadsMultisigPDA) return null;
+        const multisigPda = this.squadsMultisigPDA;
+        const index = this.squadsX.vaultIndex ?? 0;
+        const pda = multisig.getVaultPda({ multisigPda, index });
+        return pda[0];
+    }
 
     // ---------------------------------------------------------------------
     // READ-ONLY Public Methods
@@ -497,29 +680,34 @@ export class SolanaStakingClient implements IStakingClient {
         windowBefore?: number;
         windowAfter?: number;
     }): Promise<TrancheSnapshot> {
-        const {
-            chainID = SolChainID.WireTestnet,
-            windowBefore,
-            windowAfter,
-        } = options ?? {};
-
-        const [globalState, trancheState] = await Promise.all([
-            this.tokenClient.fetchGlobalState(),
-            this.tokenClient.fetchTrancheState(),
-        ]);
-
-        const { price: solPriceUsd, timestamp } =
-            await this.tokenClient.getSolPriceUsdSafe();
-
-        return buildSolanaTrancheSnapshot({
-            chainID,
-            globalState,
-            trancheState,
-            solPriceUsd,
-            nativePriceTimestamp: timestamp,
-            ladderWindowBefore: windowBefore,
-            ladderWindowAfter: windowAfter,
-        });
+        try {
+            const {
+                chainID = SolChainID.WireTestnet,
+                windowBefore,
+                windowAfter,
+            } = options ?? {};
+
+            const [globalState, trancheState] = await Promise.all([
+                this.tokenClient.fetchGlobalState(),
+                this.tokenClient.fetchTrancheState(),
+            ]);
+
+            const { price: solPriceUsd, timestamp } =
+                await this.tokenClient.getSolPriceUsdSafe();
+
+            return buildSolanaTrancheSnapshot({
+                chainID,
+                globalState,
+                trancheState,
+                solPriceUsd,
+                nativePriceTimestamp: timestamp,
+                ladderWindowBefore: windowBefore,
+                ladderWindowAfter: windowAfter,
+            });
+        }
+        catch (err) {
+            throw new Error(`Failed to build Solana tranche snapshot: ${err}`);
+        }
     }
 
     /**
@@ -528,16 +716,20 @@ export class SolanaStakingClient implements IStakingClient {
      * cluster-derived epochs-per-year.
      */
     async getSystemAPY(): Promise<number> {
-        // 1) Per-epoch rate (decimal) from on-chain stakeMetrics
-        const ratePerEpoch = await this.getEpochRateDecimalFromProgram();
-        // 2) Live epochs-per-year estimate from cluster
-        const epochsPerYear = await this.getEpochsPerYearFromCluster();
-        // 3) Compound: (1 + r)^N - 1
-        const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
-        // 4) Convert to percent
-        const apyPercent = apyDecimal * 100;
-
-        return apyPercent;
+        try {
+            // 1) Per-epoch rate (decimal) from on-chain stakeMetrics
+            const ratePerEpoch = await this.getEpochRateDecimalFromProgram();
+            // 2) Live epochs-per-year estimate from cluster
+            const epochsPerYear = await this.getEpochsPerYearFromCluster();
+            // 3) Compound: (1 + r)^N - 1
+            const apyDecimal = Math.pow(1 + ratePerEpoch, epochsPerYear) - 1;
+            // 4) Convert to percent
+            const apyPercent = apyDecimal * 100;
+
+            return apyPercent;
+        } catch (err) {
+            throw new Error(`Failed to compute Solana system APY: ${err}`);
+        }
     }
 
     /**
@@ -546,18 +738,24 @@ export class SolanaStakingClient implements IStakingClient {
      * de-scaled using PAY_RATE_SCALE_FACTOR (1e12).
      */
     private async getEpochRateDecimalFromProgram(): Promise<number> {
-        const liqSolCoreProgram = this.program.getProgram('liqsolCore');
-        const stakeMetricsPda = deriveStakeMetricsPda();
-        const stakeMetrics =
-            await liqSolCoreProgram.account.stakeMetrics.fetch(stakeMetricsPda);
+        try {
+
+            const liqSolCoreProgram = this.program.getProgram('liqsolCore');
+            const stakeMetricsPda = deriveStakeMetricsPda();
+            const stakeMetrics =
+                await liqSolCoreProgram.account.stakeMetrics.fetch(stakeMetricsPda);
 
-        // solSystemPayRate is stored on-chain with PAY_RATE_SCALE_FACTOR (1e12)
-        const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
+            // solSystemPayRate is stored on-chain with PAY_RATE_SCALE_FACTOR (1e12)
+            const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
 
-        // Convert to JS number in **decimal per epoch** units
-        const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
+            // Convert to JS number in **decimal per epoch** units
+            const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
 
-        return rateDecimal;
+            return rateDecimal;
+        }
+        catch (err) {
+            throw new Error(`Failed to read stakeMetrics from program: ${err}`);
+        }
     }
 
     // Simple cache so we don’t hammer RPC
@@ -642,7 +840,7 @@ export class SolanaStakingClient implements IStakingClient {
             return BigInt(0);
         }
 
-        const [avgPayRate, globalConfig]: [BN, GlobalConfig] = await Promise.all([
+        const [avgPayRate, globalConfig]: [BN, GlobalConfig | null] = await Promise.all([
             this.distributionClient.getAverageScaledPayRate(windowSize),
             this.distributionClient.getGlobalConfig(),
         ]);
@@ -693,14 +891,12 @@ export class SolanaStakingClient implements IStakingClient {
     }): Promise<bigint> {
         this.ensureUser();
 
-        const payer = this.solPubKey;
-
         // -------------------------------------------------------------
         // 1) Current wallet balance (prefer caller override)
         // -------------------------------------------------------------
         const balanceLamports: bigint =
             options?.balanceOverrideLamports ??
-            BigInt(await this.connection.getBalance(payer, commitment));
+            BigInt(await this.connection.getBalance(this.feePayer, commitment));
 
         if (balanceLamports <= BigInt(0)) {
             return BigInt(0);
@@ -811,7 +1007,7 @@ export class SolanaStakingClient implements IStakingClient {
             return this.cachedTxFee.value;
         }
 
-        const payer = this.solPubKey;
+        const payer = this.feePayer;
 
         const dummyIx = SystemProgram.transfer({
             fromPubkey: payer,
@@ -913,7 +1109,7 @@ export class SolanaStakingClient implements IStakingClient {
         const { blockhash, lastValidBlockHeight } =
             await this.connection.getLatestBlockhash('confirmed');
         tx.recentBlockhash = blockhash;
-        tx.feePayer = this.solPubKey;
+        tx.feePayer = this.feePayer;
         return { tx, blockhash, lastValidBlockHeight };
     }
 
@@ -922,17 +1118,27 @@ export class SolanaStakingClient implements IStakingClient {
      * Ensures we have a Wire pubKey and an Anchor wallet pubKey, and that they match.
      */
     ensureUser() {
-        if (!this.pubKey || !this.anchor.wallet.publicKey) {
-            throw new Error('User Authorization required: pubKey is undefined');
-        }
-        if (
-            this.solPubKey.toBase58() !==
-            this.anchor.wallet.publicKey.toBase58()
-        ) {
-            throw new Error(
-                'Write access requires connected wallet to match pubKey',
-            );
+        if (!this.pubKey) throw new Error('User pubKey is undefined');
+
+        const wallet = this.anchor?.wallet as any;
+        const pk = wallet?.publicKey as SolPubKey | undefined;
+
+        if (!pk) throw new Error('Wallet not connected');
+        if (typeof wallet.signTransaction !== 'function') {
+            throw new Error('Wallet does not support signTransaction');
         }
+
+        // if (!this.pubKey || !this.anchor.wallet.publicKey) {
+        //     throw new Error('User Authorization required: pubKey is undefined');
+        // }
+        // if (
+        //     this.solPubKey.toBase58() !==
+        //     this.anchor.wallet.publicKey.toBase58()
+        // ) {
+        //     throw new Error(
+        //         'Write access requires connected wallet to match pubKey',
+        //     );
+        // }
     }
 
 }