@wireio/stake 2.2.2 → 2.3.1

package/lib/stake.m.js

@@ -1,175 +1,11 @@
 import { SolChainID, PublicKey as PublicKey$1, KeyType, EvmChainID } from '@wireio/core';
-import { SystemProgram, StakeProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, PublicKey, Keypair, Connection, ComputeBudgetProgram, TransactionMessage, Transaction, SendTransactionError } from '@solana/web3.js';
+import { PublicKey, StakeProgram, Keypair, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_CLOCK_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, SYSVAR_RENT_PUBKEY, Connection, ComputeBudgetProgram, TransactionMessage, Transaction, SendTransactionError } from '@solana/web3.js';
 import { BN, Program, AnchorProvider } from '@coral-xyz/anchor';
-import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress } from '@solana/spl-token';
+import { getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID, getAssociatedTokenAddressSync, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import * as multisig from '@sqds/multisig';
 import bs58 from 'bs58';
 import { ethers, Contract, BigNumber } from 'ethers';
 
-class DepositClient {
-  constructor(provider, pgs) {
-    this.provider = provider;
-    this.pgs = pgs;
-    this.program = pgs.getProgram("liqsolCore");
-  }
-  get connection() {
-    return this.provider.connection;
-  }
-  get wallet() {
-    return this.provider.wallet;
-  }
-  async buildDepositTx(amount, user = this.wallet.publicKey) {
-    if (!user) {
-      throw new Error(
-        "DepositClient.buildDepositTx: wallet not connected"
-      );
-    }
-    if (!amount || amount <= BigInt(0)) {
-      throw new Error(
-        "DepositClient.buildDepositTx: amount must be greater than zero."
-      );
-    }
-    const depositAuthority = this.pgs.deriveDepositAuthorityPda();
-    const liqsolMint = this.pgs.deriveLiqsolMintPda();
-    const liqsolMintAuthority = this.pgs.deriveLiqsolMintAuthorityPda();
-    const reservePool = this.pgs.deriveReservePoolPda();
-    const vault = this.pgs.deriveVaultPda();
-    const controllerState = this.pgs.deriveStakeControllerStatePda();
-    const payoutState = this.pgs.derivePayoutStatePda();
-    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
-    const payRateHistory = this.pgs.derivePayRateHistoryPda();
-    const globalConfig = this.pgs.deriveGlobalConfigPda();
-    const userAta = getAssociatedTokenAddressSync(
-      liqsolMint,
-      user,
-      true,
-      TOKEN_2022_PROGRAM_ID
-    );
-    const distributionState = this.pgs.deriveDistributionStatePda();
-    const userRecord = this.pgs.deriveUserRecordPda(userAta);
-    const bucketTokenAccount = getAssociatedTokenAddressSync(
-      liqsolMint,
-      bucketAuthority,
-      true,
-      TOKEN_2022_PROGRAM_ID
-    );
-    const seed = Math.floor(Math.random() * 2 ** 32);
-    const ephemeralStake = await this.pgs.deriveEphemeralStakeAddress(user, seed);
-    return await this.program.methods.deposit(new BN(amount.toString()), seed).accounts({
-      user,
-      depositAuthority,
-      systemProgram: SystemProgram.programId,
-      tokenProgram: TOKEN_2022_PROGRAM_ID,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      liqsolProgram: this.pgs.PROGRAM_IDS.LIQSOL_TOKEN,
-      stakeProgram: StakeProgram.programId,
-      liqsolMint,
-      userAta,
-      liqsolMintAuthority,
-      reservePool,
-      vault,
-      ephemeralStake,
-      controllerState,
-      payoutState,
-      bucketAuthority,
-      bucketTokenAccount,
-      userRecord,
-      distributionState,
-      payRateHistory,
-      instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
-      clock: SYSVAR_CLOCK_PUBKEY,
-      stakeHistory: SYSVAR_STAKE_HISTORY_PUBKEY,
-      rent: SYSVAR_RENT_PUBKEY,
-      globalConfig
-    }).instruction();
-  }
-  async buildWithdrawTx(amount, user = this.wallet.publicKey) {
-    if (!user) {
-      throw new Error(
-        "DepositClient.buildWithdrawTx: wallet not connected"
-      );
-    }
-    if (!amount || amount <= BigInt(0)) {
-      throw new Error(
-        "DepositClient.buildWithdrawTx: amount must be greater than zero."
-      );
-    }
-    const liqsolMint = this.pgs.deriveLiqsolMintPda();
-    const userAta = getAssociatedTokenAddressSync(
-      liqsolMint,
-      user,
-      true,
-      TOKEN_2022_PROGRAM_ID
-    );
-    const userRecord = this.pgs.deriveUserRecordPda(userAta);
-    const distributionState = this.pgs.deriveDistributionStatePda();
-    const global = this.pgs.deriveWithdrawGlobalPda();
-    const reservePool = this.pgs.deriveReservePoolPda();
-    const stakeAllocationState = this.pgs.deriveStakeAllocationStatePda();
-    const stakeMetrics = this.pgs.deriveStakeMetricsPda();
-    const maintenanceLedger = this.pgs.deriveMaintenanceLedgerPda();
-    const globalConfig = this.pgs.deriveGlobalConfigPda();
-    const globalAcct = await this.program.account.global.fetch(global);
-    const rawId = globalAcct.nextReceiptId;
-    let receiptId;
-    if (typeof rawId === "bigint") {
-      receiptId = rawId;
-    } else if (rawId != null && typeof rawId === "object" && "toString" in rawId) {
-      receiptId = BigInt(rawId.toString());
-    } else if (typeof rawId === "number") {
-      receiptId = BigInt(rawId);
-    } else {
-      throw new Error(
-        `DepositClient.buildWithdrawTx: unexpected nextReceiptId type (${typeof rawId})`
-      );
-    }
-    const mintAuthority = this.pgs.deriveWithdrawMintAuthorityPda();
-    const metadata = this.pgs.deriveWithdrawMintMetadataPda();
-    const nftMint = this.pgs.deriveWithdrawNftMintPda(receiptId);
-    const receiptData = this.pgs.deriveLiqReceiptDataPda(nftMint);
-    const owner = user;
-    const nftAta = getAssociatedTokenAddressSync(
-      nftMint,
-      owner,
-      true,
-      TOKEN_2022_PROGRAM_ID
-    );
-    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
-    const bucketTokenAccount = getAssociatedTokenAddressSync(
-      liqsolMint,
-      bucketAuthority,
-      true,
-      TOKEN_2022_PROGRAM_ID
-    );
-    return await this.program.methods.requestWithdraw(new BN(amount.toString())).accounts({
-      user,
-      owner,
-      global,
-      liqsolMint,
-      userAta,
-      userRecord,
-      reservePool,
-      stakeAllocationState,
-      stakeMetrics,
-      maintenanceLedger,
-      clock: SYSVAR_CLOCK_PUBKEY,
-      mintAuthority,
-      receiptData,
-      metadata,
-      nftMint,
-      nftAta,
-      distributionState,
-      bucketTokenAccount,
-      tokenProgram: TOKEN_2022_PROGRAM_ID,
-      tokenInterface: TOKEN_2022_PROGRAM_ID,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-      systemProgram: SystemProgram.programId,
-      rent: SYSVAR_RENT_PUBKEY,
-      globalConfig
-    }).instruction();
-  }
-}
-
 var address$7 = "5nBtmutQLrRKBUxNfHJPDjiW5u8id6QM9Hhjg1D1g1XH";
 var metadata$7 = {
 	name: "liqsol_core",
@@ -14958,7 +14794,253 @@ function ceilDiv(n, d) {
   }
   return n.add(d.subn(1)).div(d);
 }
+function normalizeToBigInt(x) {
+  if (typeof x === "bigint") return x;
+  if (x != null && typeof x === "object" && "toString" in x) return BigInt(x.toString());
+  if (typeof x === "number") return BigInt(x);
+  throw new Error(`normalizeToBigInt: unsupported type ${typeof x}`);
+}
 
+let ConvertClient$1 = class ConvertClient {
+  constructor(provider, pgs) {
+    this.provider = provider;
+    this.pgs = pgs;
+    this.program = pgs.getProgram("liqsolCore");
+  }
+  get connection() {
+    return this.provider.connection;
+  }
+  get wallet() {
+    return this.provider.wallet;
+  }
+  async buildDepositTx(amount, user = this.wallet.publicKey) {
+    if (!user) throw new Error("ConvertClient.buildDepositTx: wallet not connected");
+    if (!amount || amount <= BigInt(0))
+      throw new Error("ConvertClient.buildDepositTx: amount must be greater than zero.");
+    const depositAuthority = this.pgs.deriveDepositAuthorityPda();
+    const liqsolMint = this.pgs.deriveLiqsolMintPda();
+    const liqsolMintAuthority = this.pgs.deriveLiqsolMintAuthorityPda();
+    const reservePool = this.pgs.deriveReservePoolPda();
+    const vault = this.pgs.deriveVaultPda();
+    const controllerState = this.pgs.deriveStakeControllerStatePda();
+    const payoutState = this.pgs.derivePayoutStatePda();
+    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+    const payRateHistory = this.pgs.derivePayRateHistoryPda();
+    const globalConfig = this.pgs.deriveGlobalConfigPda();
+    const userAta = getAssociatedTokenAddressSync(liqsolMint, user, true, TOKEN_2022_PROGRAM_ID);
+    const distributionState = this.pgs.deriveDistributionStatePda();
+    const userRecord = this.pgs.deriveUserRecordPda(userAta);
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const seed = Math.floor(Math.random() * 2 ** 32);
+    const ephemeralStake = await this.pgs.deriveEphemeralStakeAddress(user, seed);
+    return await this.program.methods.deposit(new BN(amount.toString()), seed).accounts({
+      user,
+      depositAuthority,
+      systemProgram: SystemProgram.programId,
+      tokenProgram: TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      liqsolProgram: this.pgs.PROGRAM_IDS.LIQSOL_TOKEN,
+      stakeProgram: StakeProgram.programId,
+      liqsolMint,
+      userAta,
+      liqsolMintAuthority,
+      reservePool,
+      vault,
+      ephemeralStake,
+      controllerState,
+      payoutState,
+      bucketAuthority,
+      bucketTokenAccount,
+      userRecord,
+      distributionState,
+      payRateHistory,
+      instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      stakeHistory: SYSVAR_STAKE_HISTORY_PUBKEY,
+      rent: SYSVAR_RENT_PUBKEY,
+      globalConfig
+    }).instruction();
+  }
+  async buildWithdrawTx(amount, user = this.wallet.publicKey) {
+    if (!user) throw new Error("ConvertClient.buildWithdrawTx: wallet not connected");
+    if (!amount || amount <= BigInt(0))
+      throw new Error("ConvertClient.buildWithdrawTx: amount must be greater than zero.");
+    const liqsolMint = this.pgs.deriveLiqsolMintPda();
+    const userAta = getAssociatedTokenAddressSync(liqsolMint, user, true, TOKEN_2022_PROGRAM_ID);
+    const userRecord = this.pgs.deriveUserRecordPda(userAta);
+    const distributionState = this.pgs.deriveDistributionStatePda();
+    const global = this.pgs.deriveWithdrawGlobalPda();
+    const reservePool = this.pgs.deriveReservePoolPda();
+    const stakeAllocationState = this.pgs.deriveStakeAllocationStatePda();
+    const stakeMetrics = this.pgs.deriveStakeMetricsPda();
+    const maintenanceLedger = this.pgs.deriveMaintenanceLedgerPda();
+    const globalConfig = this.pgs.deriveGlobalConfigPda();
+    const globalAcct = await this.program.account.global.fetch(global);
+    const rawId = globalAcct.nextReceiptId;
+    const receiptId = normalizeToBigInt(rawId);
+    const mintAuthority = this.pgs.deriveWithdrawMintAuthorityPda();
+    const metadata = this.pgs.deriveWithdrawMintMetadataPda();
+    const nftMint = this.pgs.deriveWithdrawNftMintPda(receiptId);
+    const receiptData = this.pgs.deriveLiqReceiptDataPda(nftMint);
+    const owner = user;
+    const nftAta = getAssociatedTokenAddressSync(nftMint, owner, true, TOKEN_2022_PROGRAM_ID);
+    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    return await this.program.methods.requestWithdraw(new BN(amount.toString())).accounts({
+      user,
+      owner,
+      global,
+      liqsolMint,
+      userAta,
+      userRecord,
+      reservePool,
+      stakeAllocationState,
+      stakeMetrics,
+      maintenanceLedger,
+      clock: SYSVAR_CLOCK_PUBKEY,
+      mintAuthority,
+      receiptData,
+      metadata,
+      nftMint,
+      nftAta,
+      distributionState,
+      bucketTokenAccount,
+      tokenProgram: TOKEN_2022_PROGRAM_ID,
+      tokenInterface: TOKEN_2022_PROGRAM_ID,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      systemProgram: SystemProgram.programId,
+      rent: SYSVAR_RENT_PUBKEY,
+      globalConfig
+    }).instruction();
+  }
+  async fetchWithdrawReceipts(owner) {
+    const globalPda = this.pgs.deriveWithdrawGlobalPda();
+    const globalAcct = await this.program.account.global.fetch(globalPda);
+    const nextId = normalizeToBigInt(globalAcct.nextReceiptId);
+    const mintToId =  new Map();
+    for (let i = BigInt(0); i < nextId; i++) {
+      const mint = this.pgs.deriveWithdrawNftMintPda(i);
+      mintToId.set(mint.toBase58(), i);
+    }
+    const tokenAccounts = await this.connection.getParsedTokenAccountsByOwner(owner, {
+      programId: TOKEN_2022_PROGRAM_ID
+    });
+    const receipts = [];
+    for (const { pubkey, account } of tokenAccounts.value) {
+      const info = account.data?.["parsed"]?.info;
+      if (!info) continue;
+      const amount = info.tokenAmount;
+      const decimals = Number(amount?.decimals ?? 0);
+      const uiAmount = Number(amount?.uiAmount ?? 0);
+      if (decimals !== 0 || uiAmount !== 1) continue;
+      const mintStr = info.mint;
+      if (!mintStr) continue;
+      const receiptId = mintToId.get(mintStr);
+      if (receiptId === void 0) continue;
+      const mintKey = new PublicKey(mintStr);
+      const receiptDataPda = this.pgs.deriveLiqReceiptDataPda(mintKey);
+      let receiptData;
+      try {
+        const raw = await this.program.account.liqReceiptData.fetch(receiptDataPda);
+        receiptData = {
+          receiptId: normalizeToBigInt(raw.receiptId),
+          liqports: normalizeToBigInt(raw.liqports),
+          epoch: normalizeToBigInt(raw.epoch),
+          fulfilled: Boolean(raw.fulfilled)
+        };
+      } catch (err) {
+        console.warn(`ConvertClient: failed to fetch receipt data for mint ${mintStr}`, err);
+        continue;
+      }
+      const { etaMs, readyAtMs } = await this.estimateEpochEta(receiptData.epoch);
+      const status = receiptData.fulfilled ? "claimed" : etaMs <= 0 ? "ready" : "queued";
+      const amountView = {
+        amount: receiptData.liqports,
+        decimals: 9,
+        symbol: "SOL"
+      };
+      receipts.push({
+        tokenId: receiptData.receiptId,
+        receipt: {
+          amount: amountView,
+          readyAt: readyAtMs,
+          chain: "SOL",
+          epoch: receiptData.epoch,
+          status,
+          mint: mintKey.toBase58(),
+          ownerAta: pubkey.toBase58()
+        }
+      });
+    }
+    return receipts;
+  }
+  async buildClaimWithdrawTx(receiptId, user) {
+    const mintAccount = this.pgs.deriveWithdrawNftMintPda(receiptId);
+    const receiptData = this.pgs.deriveLiqReceiptDataPda(mintAccount);
+    const ownerAta = getAssociatedTokenAddressSync(
+      mintAccount,
+      user,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const accounts = {
+      user,
+      global: this.pgs.deriveWithdrawGlobalPda(),
+      mintAuthority: this.pgs.deriveWithdrawMintAuthorityPda(),
+      receiptData,
+      mintAccount,
+      ownerAta,
+      reservePool: this.pgs.deriveReservePoolPda(),
+      vault: this.pgs.deriveVaultPda(),
+      clock: SYSVAR_CLOCK_PUBKEY,
+      stakeHistory: SYSVAR_STAKE_HISTORY_PUBKEY,
+      globalConfig: this.pgs.deriveGlobalConfigPda(),
+      tokenProgram: TOKEN_2022_PROGRAM_ID,
+      stakeProgram: StakeProgram.programId,
+      systemProgram: SystemProgram.programId,
+      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID
+    };
+    return this.program.methods.claimWithdraw().accounts(accounts).instruction();
+  }
+  async estimateEpochEta(targetEpoch) {
+    const conn = this.connection;
+    const epochInfo = await conn.getEpochInfo();
+    const schedule = await conn.getEpochSchedule();
+    const currentEpoch = BigInt(epochInfo.epoch);
+    if (targetEpoch <= currentEpoch) {
+      const now = Date.now();
+      return { etaMs: 0, readyAtMs: now };
+    }
+    let slotTimeSec = 0.4;
+    try {
+      const samples = await conn.getRecentPerformanceSamples(1);
+      if (samples?.length) {
+        const s = samples[0];
+        slotTimeSec = s.numSlots > 0 ? s.samplePeriodSecs / s.numSlots : slotTimeSec;
+      }
+    } catch (_) {
+    }
+    const slotsPerEpoch = BigInt(schedule.slotsPerEpoch);
+    const slotsRemainingInCurrent = slotsPerEpoch - BigInt(epochInfo.slotIndex);
+    const epochsRemaining = targetEpoch - currentEpoch - BigInt(1);
+    const slotsRemaining = (epochsRemaining > 0 ? epochsRemaining * slotsPerEpoch : BigInt(0)) + slotsRemainingInCurrent;
+    const etaSeconds = Number(slotsRemaining) * slotTimeSec;
+    const etaMs = Math.max(0, Math.round(etaSeconds * 1e3));
+    return { etaMs, readyAtMs: Date.now() + etaMs };
+  }
+};
+
+const INDEX_SCALE_BN = new BN("1000000000000");
 class DistributionClient {
   constructor(provider, pgs) {
     this.provider = provider;
@@ -14968,6 +15050,14 @@ class DistributionClient {
   get connection() {
     return this.provider.connection;
   }
+  async getTokenBalance(ata) {
+    try {
+      const bal = await this.connection.getTokenAccountBalance(ata);
+      return new BN(bal.value.amount);
+    } catch {
+      return new BN(0);
+    }
+  }
   async getDistributionState() {
     const pda = this.pgs.deriveDistributionStatePda();
     try {
@@ -15035,6 +15125,81 @@ class DistributionClient {
     }
     return { shares: userShares, totalShares, ratio };
   }
+  async getClaimableLiqsol(user) {
+    const liqsolMint = this.pgs.deriveLiqsolMintPda();
+    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+    const userAta = getAssociatedTokenAddressSync(
+      liqsolMint,
+      user,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const [distributionState, userRecord, actualBalance, bucketBalance] = await Promise.all([
+      this.getDistributionState(),
+      this.getUserRecord(user),
+      this.getTokenBalance(userAta),
+      this.getTokenBalance(bucketTokenAccount)
+    ]);
+    if (!distributionState || !userRecord) {
+      return new BN(0);
+    }
+    let syncedIndex = new BN(distributionState.currentIndex.toString());
+    const totalShares = new BN(distributionState.totalShares.toString());
+    const lastBucketBalance = new BN(distributionState.lastBucketBalance.toString());
+    if (totalShares.gt(new BN(0)) && bucketBalance.gt(lastBucketBalance)) {
+      const delta = bucketBalance.sub(lastBucketBalance);
+      const indexDelta = delta.mul(INDEX_SCALE_BN).div(totalShares);
+      if (indexDelta.gt(new BN(0))) {
+        syncedIndex = syncedIndex.add(indexDelta);
+      }
+    }
+    const shares = new BN(userRecord.shares.toString());
+    const entitled = shares.mul(syncedIndex).div(INDEX_SCALE_BN);
+    if (entitled.lte(actualBalance)) {
+      return new BN(0);
+    }
+    return entitled.sub(actualBalance);
+  }
+  async buildClaimRewardsIx(user) {
+    const liqsolMint = this.pgs.deriveLiqsolMintPda();
+    const distributionState = this.pgs.deriveDistributionStatePda();
+    const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+    const userAta = getAssociatedTokenAddressSync(
+      liqsolMint,
+      user,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const bucketTokenAccount = getAssociatedTokenAddressSync(
+      liqsolMint,
+      bucketAuthority,
+      true,
+      TOKEN_2022_PROGRAM_ID
+    );
+    const userRecord = this.pgs.deriveUserRecordPda(userAta);
+    const bucketUserRecord = this.pgs.deriveUserRecordPda(bucketTokenAccount);
+    const extraAccountMetaList = this.pgs.deriveExtraAccountMetaListPda(liqsolMint);
+    return this.program.methods.claimRewards().accounts({
+      user,
+      userAta,
+      userRecord,
+      bucketUserRecord,
+      distributionState,
+      extraAccountMetaList,
+      liqsolCoreProgram: this.pgs.PROGRAM_IDS.LIQSOL_CORE,
+      transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
+      liqsolMint,
+      bucketAuthority,
+      bucketTokenAccount,
+      tokenProgram: TOKEN_2022_PROGRAM_ID
+    }).instruction();
+  }
   async getAverageScaledPayRate(windowSize = 5) {
     const history = await this.getPayRateHistory();
     if (!history) {
@@ -15729,7 +15894,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       commitment
     });
     this.program = new SolanaProgramService(this.anchor, config.network.chainId);
-    this.depositClient = new DepositClient(this.anchor, this.program);
+    this.convertClient = new ConvertClient$1(this.anchor, this.program);
     this.distributionClient = new DistributionClient(this.anchor, this.program);
     this.leaderboardClient = new LeaderboardClient(this.anchor, this.program);
     this.outpostClient = new OutpostClient(this.anchor, this.program);
@@ -15756,7 +15921,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     if (amountLamports <= BigInt(0))
       throw new Error("Deposit amount must be greater than zero.");
     try {
-      const ix = await this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
+      const ix = await this.convertClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
       return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
     } catch (err) {
       console.log(`Failed to deposit Solana: ${err}`);
@@ -15768,13 +15933,40 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     if (amountLamports <= BigInt(0))
       throw new Error("Withdraw amount must be greater than zero.");
     try {
-      const ix = await this.depositClient.buildWithdrawTx(amountLamports, this.squadsVaultPDA);
+      const ix = await this.convertClient.buildWithdrawTx(amountLamports, this.squadsVaultPDA);
       return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
     } catch (err) {
       console.log(`Failed to withdraw Solana: ${err}`);
       throw err;
     }
   }
+  async getPendingWithdraws() {
+    this.ensureUser();
+    const owner = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
+    return await this.convertClient.fetchWithdrawReceipts(owner);
+  }
+  async claimWithdraw(tokenId) {
+    this.ensureUser();
+    const owner = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
+    try {
+      const ix = await this.convertClient.buildClaimWithdrawTx(tokenId, owner);
+      return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
+    } catch (err) {
+      console.log(`Failed to claim withdraw on Solana: ${err}`);
+      throw err;
+    }
+  }
+  async claimLiqsolRewards() {
+    this.ensureUser();
+    const owner = this.squadsVaultPDA ?? this.anchor.wallet.publicKey;
+    try {
+      const ix = await this.distributionClient.buildClaimRewardsIx(owner);
+      return !!this.squadsX ? await this.sendSquadsIxs(ix) : await this.buildAndSendIx(ix);
+    } catch (err) {
+      console.log(`Failed to claim liqSOL rewards on Solana: ${err}`);
+      throw err;
+    }
+  }
   async stake(amountLamports) {
     this.ensureUser();
     if (!amountLamports || amountLamports <= BigInt(0))
@@ -15824,10 +16016,11 @@ const _SolanaStakingClient = class _SolanaStakingClient {
         TOKEN_2022_PROGRAM_ID,
         ASSOCIATED_TOKEN_PROGRAM_ID
       );
-      const [nativeLamports, actualBalResp, snapshot] = await Promise.all([
+      const [nativeLamports, actualBalResp, snapshot, claimableLamports] = await Promise.all([
         this.connection.getBalance(user, "confirmed"),
         this.connection.getTokenAccountBalance(userLiqsolAta, "confirmed").catch(() => null),
-        this.outpostClient.fetchWireState(user).catch(() => null)
+        this.outpostClient.fetchWireState(user).catch(() => null),
+        this.distributionClient.getClaimableLiqsol(user).catch(() => new BN(0))
       ]);
       const LIQSOL_DECIMALS = 9;
       const actualAmountStr = actualBalResp?.value?.amount ?? "0";
@@ -15864,6 +16057,12 @@ const _SolanaStakingClient = class _SolanaStakingClient {
           decimals: LIQSOL_DECIMALS,
           ata: userLiqsolAta
         },
+        claimable: {
+          amount: BigInt(claimableLamports.toString()),
+          symbol: "LiqSOL",
+          decimals: LIQSOL_DECIMALS,
+          ata: userLiqsolAta
+        },
         staked: {
           amount: stakedLiqsol,
           symbol: "LiqSOL",
@@ -41289,47 +41488,25 @@ class ReceiptClient {
     }
     return results;
   }
-  async getOwnedReceiptNFTsFor(owner, fromBlock = 0, toBlock = "latest") {
-    const receiptContract = this.contract.ReceiptNFT;
-    const toLogs = await receiptContract.queryFilter(
-      receiptContract.filters.Transfer(null, owner),
-      fromBlock,
-      toBlock
-    );
-    const fromLogs = await receiptContract.queryFilter(
-      receiptContract.filters.Transfer(owner, null),
-      fromBlock,
-      toBlock
-    );
-    const owned =  new Set();
-    for (const e of toLogs) {
-      const tokenId = e.args?.tokenId;
-      if (!tokenId) continue;
-      owned.add(tokenId.toString());
-    }
-    for (const e of fromLogs) {
-      const tokenId = e.args?.tokenId;
-      if (!tokenId) continue;
-      owned.delete(tokenId.toString());
-    }
-    return Array.from(owned).map((id) => BigNumber.from(id));
-  }
   async fetchWithdrawReceipts(address) {
     const tokenIds = await this.getOwnedWithdrawReceiptsFor(address);
     const results = [];
     for (const idBN of tokenIds) {
       try {
         const receiptData = await this.contract.WithdrawalQueue.info(idBN);
+        const readyAtMs = Number(receiptData.readyAt) * 1e3;
+        const status = readyAtMs <= Date.now() ? "ready" : "queued";
         results.push({
           tokenId: idBN.toBigInt(),
           receipt: {
-            ethAmount: receiptData.ethAmount,
-            ethBalance: {
+            amount: {
               amount: receiptData.ethAmount.toBigInt(),
               decimals: 18,
               symbol: "ETH"
             },
-            readyAt: new Date(Number(receiptData.readyAt.toString()) * 1e3).valueOf()
+            readyAt: readyAtMs,
+            chain: "ETH",
+            status
           }
         });
       } catch (err) {
@@ -41364,6 +41541,31 @@ class ReceiptClient {
     }
     return Array.from(owned).map((id) => BigNumber.from(id));
   }
+  async getOwnedReceiptNFTsFor(owner, fromBlock = 0, toBlock = "latest") {
+    const receiptContract = this.contract.ReceiptNFT;
+    const toLogs = await receiptContract.queryFilter(
+      receiptContract.filters.Transfer(null, owner),
+      fromBlock,
+      toBlock
+    );
+    const fromLogs = await receiptContract.queryFilter(
+      receiptContract.filters.Transfer(owner, null),
+      fromBlock,
+      toBlock
+    );
+    const owned =  new Set();
+    for (const e of toLogs) {
+      const tokenId = e.args?.tokenId;
+      if (!tokenId) continue;
+      owned.add(tokenId.toString());
+    }
+    for (const e of fromLogs) {
+      const tokenId = e.args?.tokenId;
+      if (!tokenId) continue;
+      owned.delete(tokenId.toString());
+    }
+    return Array.from(owned).map((id) => BigNumber.from(id));
+  }
 }
 
 class ValidatorClient {
@@ -41434,6 +41636,9 @@ class EthereumStakingClient {
   get network() {
     return this.config.network;
   }
+  get address() {
+    return this.signer?.getAddress();
+  }
   async deposit(amount) {
     this.ensureUser();
     const amountWei = BigNumber.isBigNumber(amount) ? amount : BigNumber.from(amount);
@@ -41442,14 +41647,14 @@ class EthereumStakingClient {
   }
   async withdraw(amount) {
     this.ensureUser();
-    const address = await this.signer.getAddress();
+    const address = await this.address;
     const amountWei = BigNumber.from(amount);
     const result = await this.convertClient.performWithdraw(address, amountWei);
     return result.txHash;
   }
-  async loadPendingWithdraws() {
+  async getPendingWithdraws() {
     this.ensureUser();
-    const address = await this.signer.getAddress();
+    const address = await this.address;
     return await this.receiptClient.fetchWithdrawReceipts(address);
   }
   async claimWithdraw(tokenId) {
@@ -41460,7 +41665,7 @@ class EthereumStakingClient {
   }
   async stake(amount) {
     this.ensureUser();
-    const walletAddress = await this.signer.getAddress();
+    const walletAddress = await this.address;
     const amountWei = BigNumber.from(amount);
     const result = await this.stakeClient.performStake(amountWei, walletAddress);
     return result.txHash;
@@ -41476,7 +41681,7 @@ class EthereumStakingClient {
   }
   async buy(amount) {
     this.ensureUser();
-    const buyer = await this.signer.getAddress();
+    const buyer = await this.address;
     let result = await this.pretokenClient.purchasePretokensWithLiqETH(amount, buyer);
     return result && result.txHash ? result.txHash : "Error - no resulting txHash";
   }
@@ -41488,7 +41693,7 @@ class EthereumStakingClient {
   async getPortfolio() {
     try {
       if (!this.signer) return Promise.resolve(null);
-      const walletAddress = await this.signer.getAddress();
+      const walletAddress = await this.address;
       const nativeBalance = await this.provider.getBalance(walletAddress);
       const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
       const nativeSymbol = this.network?.nativeCurrency?.symbol ?? "ETH";
@@ -41566,12 +41771,12 @@ class EthereumStakingClient {
   }
   async fetchPrelaunchReceipts(address) {
     this.ensureUser();
-    if (address === void 0) address = await this.signer.getAddress();
+    if (address === void 0) address = await this.address;
     return await this.receiptClient.stakeReceipts(address);
   }
   async getOPPMessages(address) {
     this.ensureUser();
-    if (!address) address = await this.signer.getAddress();
+    if (!address) address = await this.address;
     return await this.oppClient.getMessages(address);
   }
   ensureUser() {
@@ -41646,7 +41851,7 @@ class EthereumStakingClient {
   }
   async getDepositBuffer(options) {
     this.ensureUser();
-    const walletAddress = await this.signer.getAddress();
+    const walletAddress = await this.address;
     const baseGas = await this.provider.estimateGas({
       from: walletAddress,
       to: walletAddress,
@@ -41741,13 +41946,13 @@ const CONTRACT_NAMES = [
 ];
 
 var types$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    CONTRACT_NAMES: CONTRACT_NAMES
+  __proto__: null,
+  CONTRACT_NAMES: CONTRACT_NAMES
 });
 
 var types = /*#__PURE__*/Object.freeze({
-    __proto__: null
+  __proto__: null
 });
 
-export { ADDRESSES, ADDRESS_BOOK_BY_CHAIN, CHAINLINK_FEED, CHAINLINK_PROGRAM, CONTRACTS_BY_CHAIN, DEFAULT_AVERAGE_PAY_RATE, DEFAULT_PAY_RATE_LOOKBACK, DepositClient, 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, 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, scheduledInstruction, sleep, solToLamports, toBigint, tokensToShares, waitForConfirmation, waitUntilSafeToExecuteFunction };
 //# sourceMappingURL=stake.m.js.map