@wireio/stake 0.7.3 → 1.0.1

package/src/networks/solana/solana.ts

@@ -207,14 +207,22 @@ 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 {
+            // Build compute budget increase instruction
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+
+            // Build the Outpost synd instruction
+            const ix = await this.depositClient.buildDepositTx(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 deposit Solana: ${err}`);
+        }
     }
 
     /**
@@ -233,14 +241,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 +269,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 +299,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 +332,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 +360,145 @@ export class SolanaStakingClient implements IStakingClient {
     async getPortfolio(): Promise<Portfolio> {
         if (!this.pubKey) throw new Error('User pubKey is undefined');
 
-        const user = this.solPubKey;
-
-        const reservePoolPDA = deriveReservePoolPda();
-        const vaultPDA = deriveVaultPda();
-        const liqsolMint = deriveLiqsolMintPda();
-
-        const userLiqsolAta = getAssociatedTokenAddressSync(
-            liqsolMint,
-            user,
-            false,
-            TOKEN_2022_PROGRAM_ID,
-            ASSOCIATED_TOKEN_PROGRAM_ID,
-        );
-
-        // 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),
-        ]);
+        try {
+            const user = this.solPubKey;
+
+            const reservePoolPDA = deriveReservePoolPda();
+            const vaultPDA = deriveVaultPda();
+            const liqsolMint = deriveLiqsolMintPda();
+
+            const userLiqsolAta = getAssociatedTokenAddressSync(
+                liqsolMint,
+                user,
+                false,
+                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}`);
+        }
     }
 
     /**
@@ -497,29 +530,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 +566,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 +588,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 {
 
-        // solSystemPayRate is stored on-chain with PAY_RATE_SCALE_FACTOR (1e12)
-        const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
+            const liqSolCoreProgram = this.program.getProgram('liqsolCore');
+            const stakeMetricsPda = deriveStakeMetricsPda();
+            const stakeMetrics =
+                await liqSolCoreProgram.account.stakeMetrics.fetch(stakeMetricsPda);
 
-        // Convert to JS number in **decimal per epoch** units
-        const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
+            // solSystemPayRate is stored on-chain with PAY_RATE_SCALE_FACTOR (1e12)
+            const raw = BigInt(stakeMetrics.solSystemPayRate.toString());
 
-        return rateDecimal;
+            // Convert to JS number in **decimal per epoch** units
+            const rateDecimal = Number(raw) / Number(PAY_RATE_SCALE_FACTOR);
+
+            return rateDecimal;
+        }
+        catch (err) {
+            throw new Error(`Failed to read stakeMetrics from program: ${err}`);
+        }
     }
 
     // Simple cache so we don’t hammer RPC

package/src/staker.ts

@@ -36,13 +36,11 @@ export class Staker {
 
         config.forEach((cfg) => {
             switch (cfg.network.chainId) {
-                case SolChainID.Devnet:
-                case SolChainID.WireTestnet:
+                case SolChainID.Mainnet:
                     this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
                     break;
 
                 case EvmChainID.Ethereum:
-                case EvmChainID.Hoodi:
                     this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
                     break;