@wireio/stake 2.2.2 → 2.3.0

package/lib/stake.js

@@ -9,213 +9,24 @@ var bs58 = require('bs58');
 var ethers = require('ethers');
 
 function _interopNamespaceDefault(e) {
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
         });
-    }
-    n.default = e;
-    return Object.freeze(n);
-}
-
-var multisig__namespace = /*#__PURE__*/_interopNamespaceDefault(multisig);
-
-var __pow = Math.pow;
-var __async$h = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
       }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-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;
-  }
-  buildDepositTx(_0) {
-    return __async$h(this, arguments, function* (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 = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        user,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID
-      );
-      const distributionState = this.pgs.deriveDistributionStatePda();
-      const userRecord = this.pgs.deriveUserRecordPda(userAta);
-      const bucketTokenAccount = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        bucketAuthority,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID
-      );
-      const seed = Math.floor(Math.random() * __pow(2, 32));
-      const ephemeralStake = yield this.pgs.deriveEphemeralStakeAddress(user, seed);
-      return yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
-        user,
-        depositAuthority,
-        systemProgram: web3_js.SystemProgram.programId,
-        tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
-        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
-        liqsolProgram: this.pgs.PROGRAM_IDS.LIQSOL_TOKEN,
-        stakeProgram: web3_js.StakeProgram.programId,
-        liqsolMint,
-        userAta,
-        liqsolMintAuthority,
-        reservePool,
-        vault,
-        ephemeralStake,
-        controllerState,
-        payoutState,
-        bucketAuthority,
-        bucketTokenAccount,
-        userRecord,
-        distributionState,
-        payRateHistory,
-        instructionsSysvar: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
-        clock: web3_js.SYSVAR_CLOCK_PUBKEY,
-        stakeHistory: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY,
-        rent: web3_js.SYSVAR_RENT_PUBKEY,
-        globalConfig
-      }).instruction();
-    });
-  }
-  buildWithdrawTx(_0) {
-    return __async$h(this, arguments, function* (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 = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        user,
-        true,
-        splToken.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 = yield 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 = splToken.getAssociatedTokenAddressSync(
-        nftMint,
-        owner,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID
-      );
-      const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
-      const bucketTokenAccount = splToken.getAssociatedTokenAddressSync(
-        liqsolMint,
-        bucketAuthority,
-        true,
-        splToken.TOKEN_2022_PROGRAM_ID
-      );
-      return yield this.program.methods.requestWithdraw(new anchor.BN(amount.toString())).accounts({
-        user,
-        owner,
-        global,
-        liqsolMint,
-        userAta,
-        userRecord,
-        reservePool,
-        stakeAllocationState,
-        stakeMetrics,
-        maintenanceLedger,
-        clock: web3_js.SYSVAR_CLOCK_PUBKEY,
-        mintAuthority,
-        receiptData,
-        metadata,
-        nftMint,
-        nftAta,
-        distributionState,
-        bucketTokenAccount,
-        tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
-        tokenInterface: splToken.TOKEN_2022_PROGRAM_ID,
-        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
-        systemProgram: web3_js.SystemProgram.programId,
-        rent: web3_js.SYSVAR_RENT_PUBKEY,
-        globalConfig
-      }).instruction();
     });
   }
+  n.default = e;
+  return Object.freeze(n);
 }
 
+var multisig__namespace = /*#__PURE__*/_interopNamespaceDefault(multisig);
+
 var address$7 = "5nBtmutQLrRKBUxNfHJPDjiW5u8id6QM9Hhjg1D1g1XH";
 var metadata$7 = {
 	name: "liqsol_core",
@@ -14638,7 +14449,7 @@ var devnetTransferHookIDL = {
 	types: types$2
 };
 
-var __async$g = (__this, __arguments, generator) => {
+var __async$h = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -14716,7 +14527,7 @@ const PDA_SEEDS = {
   LIQ_RECEIPT_DATA: "liq_receipt_data",
   WITHDRAW_MINT: "mint"
 };
-const deriveEphemeralStakeAddress = (user, seed) => __async$g(null, null, function* () {
+const deriveEphemeralStakeAddress = (user, seed) => __async$h(null, null, function* () {
   const seedStr = `ephemeral_${seed}`;
   return web3_js.PublicKey.createWithSeed(user, seedStr, web3_js.StakeProgram.programId);
 });
@@ -14735,7 +14546,7 @@ const INDEX_SCALE$1 = BigInt(1e12);
 const lamportsToSol = (lamports) => Number(lamports) / LAMPORTS_PER_SOL;
 const solToLamports = (sol) => BigInt(Math.round(sol * LAMPORTS_PER_SOL));
 
-var __async$f = (__this, __arguments, generator) => {
+var __async$g = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -14889,7 +14700,7 @@ function buildSolanaTrancheSnapshot(options) {
   };
 }
 function buildOutpostAccounts(connection, user, pgs) {
-  return __async$f(this, null, function* () {
+  return __async$g(this, null, function* () {
     const globalState = pgs.deriveOutpostGlobalStatePda();
     const poolAuthority = pgs.deriveOutpostPoolAuthorityPda();
     const liqsolMint = pgs.deriveLiqsolMintPda();
@@ -14954,7 +14765,7 @@ function buildOutpostAccounts(connection, user, pgs) {
   });
 }
 function getEpochSnapshot(connection) {
-  return __async$f(this, null, function* () {
+  return __async$g(this, null, function* () {
     var _a;
     const info = yield connection.getEpochInfo();
     let slotTimeMs = Number((_a = process.env.SLOT_TIME_MS_FALLBACK) != null ? _a : 400);
@@ -14985,7 +14796,7 @@ function msToEpochEnd(snapshot) {
   return remainingSlots * snapshot.slotMs;
 }
 function scheduledInstruction(connection, config, instruction) {
-  return __async$f(this, null, function* () {
+  return __async$g(this, null, function* () {
     var _a, _b;
     const early = (_a = config.early) != null ? _a : 0.1;
     const late = (_b = config.late) != null ? _b : 0.9;
@@ -15032,14 +14843,14 @@ function generateTestKeypair() {
   return web3_js.Keypair.generate();
 }
 function airdropSol(connection, publicKey, amountSol) {
-  return __async$f(this, null, function* () {
+  return __async$g(this, null, function* () {
     const lamports = solToLamports(amountSol);
     const sig = yield connection.requestAirdrop(publicKey, Number(lamports));
     yield connection.confirmTransaction(sig, "confirmed");
   });
 }
 function waitForConfirmation(connection, signature) {
-  return __async$f(this, null, function* () {
+  return __async$g(this, null, function* () {
     yield connection.confirmTransaction(signature, "confirmed");
   });
 }
@@ -15047,8 +14858,8 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function waitUntilSafeToExecuteFunction(_0) {
-  return __async$f(this, arguments, function* (connection, config = {}) {
-    yield scheduledInstruction(connection, config, () => __async$f(null, null, function* () {
+  return __async$g(this, arguments, function* (connection, config = {}) {
+    yield scheduledInstruction(connection, config, () => __async$g(null, null, function* () {
       return;
     }));
   });
@@ -15059,6 +14870,283 @@ 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}`);
+}
+
+var __pow = Math.pow;
+var __async$f = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+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;
+  }
+  buildDepositTx(_0) {
+    return __async$f(this, arguments, function* (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 = splToken.getAssociatedTokenAddressSync(liqsolMint, user, true, splToken.TOKEN_2022_PROGRAM_ID);
+      const distributionState = this.pgs.deriveDistributionStatePda();
+      const userRecord = this.pgs.deriveUserRecordPda(userAta);
+      const bucketTokenAccount = splToken.getAssociatedTokenAddressSync(
+        liqsolMint,
+        bucketAuthority,
+        true,
+        splToken.TOKEN_2022_PROGRAM_ID
+      );
+      const seed = Math.floor(Math.random() * __pow(2, 32));
+      const ephemeralStake = yield this.pgs.deriveEphemeralStakeAddress(user, seed);
+      return yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
+        user,
+        depositAuthority,
+        systemProgram: web3_js.SystemProgram.programId,
+        tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
+        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
+        liqsolProgram: this.pgs.PROGRAM_IDS.LIQSOL_TOKEN,
+        stakeProgram: web3_js.StakeProgram.programId,
+        liqsolMint,
+        userAta,
+        liqsolMintAuthority,
+        reservePool,
+        vault,
+        ephemeralStake,
+        controllerState,
+        payoutState,
+        bucketAuthority,
+        bucketTokenAccount,
+        userRecord,
+        distributionState,
+        payRateHistory,
+        instructionsSysvar: web3_js.SYSVAR_INSTRUCTIONS_PUBKEY,
+        clock: web3_js.SYSVAR_CLOCK_PUBKEY,
+        stakeHistory: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY,
+        rent: web3_js.SYSVAR_RENT_PUBKEY,
+        globalConfig
+      }).instruction();
+    });
+  }
+  buildWithdrawTx(_0) {
+    return __async$f(this, arguments, function* (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 = splToken.getAssociatedTokenAddressSync(liqsolMint, user, true, splToken.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 = yield 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 = splToken.getAssociatedTokenAddressSync(nftMint, owner, true, splToken.TOKEN_2022_PROGRAM_ID);
+      const bucketAuthority = this.pgs.deriveBucketAuthorityPda();
+      const bucketTokenAccount = splToken.getAssociatedTokenAddressSync(
+        liqsolMint,
+        bucketAuthority,
+        true,
+        splToken.TOKEN_2022_PROGRAM_ID
+      );
+      return yield this.program.methods.requestWithdraw(new anchor.BN(amount.toString())).accounts({
+        user,
+        owner,
+        global,
+        liqsolMint,
+        userAta,
+        userRecord,
+        reservePool,
+        stakeAllocationState,
+        stakeMetrics,
+        maintenanceLedger,
+        clock: web3_js.SYSVAR_CLOCK_PUBKEY,
+        mintAuthority,
+        receiptData,
+        metadata,
+        nftMint,
+        nftAta,
+        distributionState,
+        bucketTokenAccount,
+        tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
+        tokenInterface: splToken.TOKEN_2022_PROGRAM_ID,
+        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID,
+        systemProgram: web3_js.SystemProgram.programId,
+        rent: web3_js.SYSVAR_RENT_PUBKEY,
+        globalConfig
+      }).instruction();
+    });
+  }
+  fetchWithdrawReceipts(owner) {
+    return __async$f(this, null, function* () {
+      var _a, _b, _c, _d;
+      const globalPda = this.pgs.deriveWithdrawGlobalPda();
+      const globalAcct = yield 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 = yield this.connection.getParsedTokenAccountsByOwner(owner, {
+        programId: splToken.TOKEN_2022_PROGRAM_ID
+      });
+      const receipts = [];
+      for (const { pubkey, account } of tokenAccounts.value) {
+        const info = (_b = (_a = account.data) == null ? void 0 : _a["parsed"]) == null ? void 0 : _b.info;
+        if (!info) continue;
+        const amount = info.tokenAmount;
+        const decimals = Number((_c = amount == null ? void 0 : amount.decimals) != null ? _c : 0);
+        const uiAmount = Number((_d = amount == null ? void 0 : amount.uiAmount) != null ? _d : 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 web3_js.PublicKey(mintStr);
+        const receiptDataPda = this.pgs.deriveLiqReceiptDataPda(mintKey);
+        let receiptData;
+        try {
+          const raw = yield 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 } = yield 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;
+    });
+  }
+  buildClaimWithdrawTx(receiptId, user) {
+    return __async$f(this, null, function* () {
+      const mintAccount = this.pgs.deriveWithdrawNftMintPda(receiptId);
+      const receiptData = this.pgs.deriveLiqReceiptDataPda(mintAccount);
+      const ownerAta = splToken.getAssociatedTokenAddressSync(
+        mintAccount,
+        user,
+        true,
+        splToken.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: web3_js.SYSVAR_CLOCK_PUBKEY,
+        stakeHistory: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY,
+        globalConfig: this.pgs.deriveGlobalConfigPda(),
+        tokenProgram: splToken.TOKEN_2022_PROGRAM_ID,
+        stakeProgram: web3_js.StakeProgram.programId,
+        systemProgram: web3_js.SystemProgram.programId,
+        associatedTokenProgram: splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+      };
+      return this.program.methods.claimWithdraw().accounts(accounts).instruction();
+    });
+  }
+  estimateEpochEta(targetEpoch) {
+    return __async$f(this, null, function* () {
+      const conn = this.connection;
+      const epochInfo = yield conn.getEpochInfo();
+      const schedule = yield 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 = yield conn.getRecentPerformanceSamples(1);
+        if (samples == null ? void 0 : 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 };
+    });
+  }
+};
 
 var __async$e = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -16027,7 +16115,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);
@@ -16056,7 +16144,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (amountLamports <= BigInt(0))
         throw new Error("Deposit amount must be greater than zero.");
       try {
-        const ix = yield this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
+        const ix = yield this.convertClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
         return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to deposit Solana: ${err}`);
@@ -16070,7 +16158,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (amountLamports <= BigInt(0))
         throw new Error("Withdraw amount must be greater than zero.");
       try {
-        const ix = yield this.depositClient.buildWithdrawTx(amountLamports, this.squadsVaultPDA);
+        const ix = yield this.convertClient.buildWithdrawTx(amountLamports, this.squadsVaultPDA);
         return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
       } catch (err) {
         console.log(`Failed to withdraw Solana: ${err}`);
@@ -16078,6 +16166,28 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       }
     });
   }
+  getPendingWithdraws() {
+    return __async$9(this, null, function* () {
+      var _a;
+      this.ensureUser();
+      const owner = (_a = this.squadsVaultPDA) != null ? _a : this.anchor.wallet.publicKey;
+      return yield this.convertClient.fetchWithdrawReceipts(owner);
+    });
+  }
+  claimWithdraw(tokenId) {
+    return __async$9(this, null, function* () {
+      var _a;
+      this.ensureUser();
+      const owner = (_a = this.squadsVaultPDA) != null ? _a : this.anchor.wallet.publicKey;
+      try {
+        const ix = yield this.convertClient.buildClaimWithdrawTx(tokenId, owner);
+        return !!this.squadsX ? yield this.sendSquadsIxs(ix) : yield this.buildAndSendIx(ix);
+      } catch (err) {
+        console.log(`Failed to claim withdraw on Solana: ${err}`);
+        throw err;
+      }
+    });
+  }
   stake(amountLamports) {
     return __async$9(this, null, function* () {
       this.ensureUser();
@@ -41823,34 +41933,6 @@ class ReceiptClient {
       return results;
     });
   }
-  getOwnedReceiptNFTsFor(owner, fromBlock = 0, toBlock = "latest") {
-    return __async$2(this, null, function* () {
-      var _a, _b;
-      const receiptContract = this.contract.ReceiptNFT;
-      const toLogs = yield receiptContract.queryFilter(
-        receiptContract.filters.Transfer(null, owner),
-        fromBlock,
-        toBlock
-      );
-      const fromLogs = yield receiptContract.queryFilter(
-        receiptContract.filters.Transfer(owner, null),
-        fromBlock,
-        toBlock
-      );
-      const owned =  new Set();
-      for (const e of toLogs) {
-        const tokenId = (_a = e.args) == null ? void 0 : _a.tokenId;
-        if (!tokenId) continue;
-        owned.add(tokenId.toString());
-      }
-      for (const e of fromLogs) {
-        const tokenId = (_b = e.args) == null ? void 0 : _b.tokenId;
-        if (!tokenId) continue;
-        owned.delete(tokenId.toString());
-      }
-      return Array.from(owned).map((id) => ethers.BigNumber.from(id));
-    });
-  }
   fetchWithdrawReceipts(address) {
     return __async$2(this, null, function* () {
       const tokenIds = yield this.getOwnedWithdrawReceiptsFor(address);
@@ -41858,16 +41940,19 @@ class ReceiptClient {
       for (const idBN of tokenIds) {
         try {
           const receiptData = yield 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) {
@@ -41906,6 +41991,34 @@ class ReceiptClient {
       return Array.from(owned).map((id) => ethers.BigNumber.from(id));
     });
   }
+  getOwnedReceiptNFTsFor(owner, fromBlock = 0, toBlock = "latest") {
+    return __async$2(this, null, function* () {
+      var _a, _b;
+      const receiptContract = this.contract.ReceiptNFT;
+      const toLogs = yield receiptContract.queryFilter(
+        receiptContract.filters.Transfer(null, owner),
+        fromBlock,
+        toBlock
+      );
+      const fromLogs = yield receiptContract.queryFilter(
+        receiptContract.filters.Transfer(owner, null),
+        fromBlock,
+        toBlock
+      );
+      const owned =  new Set();
+      for (const e of toLogs) {
+        const tokenId = (_a = e.args) == null ? void 0 : _a.tokenId;
+        if (!tokenId) continue;
+        owned.add(tokenId.toString());
+      }
+      for (const e of fromLogs) {
+        const tokenId = (_b = e.args) == null ? void 0 : _b.tokenId;
+        if (!tokenId) continue;
+        owned.delete(tokenId.toString());
+      }
+      return Array.from(owned).map((id) => ethers.BigNumber.from(id));
+    });
+  }
 }
 
 var __async$1 = (__this, __arguments, generator) => {
@@ -42036,7 +42149,7 @@ class EthereumStakingClient {
       return result.txHash;
     });
   }
-  loadPendingWithdraws() {
+  getPendingWithdraws() {
     return __async(this, null, function* () {
       this.ensureUser();
       const address = yield this.signer.getAddress();
@@ -42364,12 +42477,12 @@ 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
 });
 
 exports.ADDRESSES = ADDRESSES;
@@ -42377,9 +42490,9 @@ exports.ADDRESS_BOOK_BY_CHAIN = ADDRESS_BOOK_BY_CHAIN;
 exports.CHAINLINK_FEED = CHAINLINK_FEED;
 exports.CHAINLINK_PROGRAM = CHAINLINK_PROGRAM;
 exports.CONTRACTS_BY_CHAIN = CONTRACTS_BY_CHAIN;
+exports.ConvertClient = ConvertClient$1;
 exports.DEFAULT_AVERAGE_PAY_RATE = DEFAULT_AVERAGE_PAY_RATE;
 exports.DEFAULT_PAY_RATE_LOOKBACK = DEFAULT_PAY_RATE_LOOKBACK;
-exports.DepositClient = DepositClient;
 exports.DistributionClient = DistributionClient;
 exports.EPHEMERAL_RENT_EXEMPTION = EPHEMERAL_RENT_EXEMPTION;
 exports.ERC1155Abi = ERC1155Abi;
@@ -42420,6 +42533,7 @@ exports.getErrorMessage = getErrorMessage;
 exports.getProgramIds = getProgramIds;
 exports.lamportsToSol = lamportsToSol;
 exports.msToEpochEnd = msToEpochEnd;
+exports.normalizeToBigInt = normalizeToBigInt;
 exports.scheduledInstruction = scheduledInstruction;
 exports.sleep = sleep;
 exports.solToLamports = solToLamports;