@wireio/stake 0.9.0 → 0.9.2

package/lib/stake.js

@@ -4,8 +4,28 @@ var core = require('@wireio/core');
 var web3_js = require('@solana/web3.js');
 var anchor = require('@coral-xyz/anchor');
 var splToken = require('@solana/spl-token');
+var multisig = require('@sqds/multisig');
 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]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var multisig__namespace = /*#__PURE__*/_interopNamespaceDefault(multisig);
+
 var address$3 = "5nBtmutQLrRKBUxNfHJPDjiW5u8id6QM9Hhjg1D1g1XH";
 var metadata$3 = {
 	name: "liqsol_core",
@@ -7502,6 +7522,9 @@ class DepositClient {
     const svc = new SolanaProgramService(provider);
     this.program = svc.getProgram("liqsolCore");
   }
+  get connection() {
+    return this.provider.connection;
+  }
   get wallet() {
     return this.provider.wallet;
   }
@@ -7530,7 +7553,7 @@ class DepositClient {
       const userAta = splToken.getAssociatedTokenAddressSync(
         liqsolMint,
         user,
-        false,
+        true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
       const distributionState = deriveDistributionStatePda();
@@ -7543,7 +7566,7 @@ class DepositClient {
       );
       const seed = Math.floor(Math.random() * __pow(2, 32));
       const ephemeralStake = yield deriveEphemeralStakeAddress(user, seed);
-      const ix = yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
+      return yield this.program.methods.deposit(new anchor.BN(amount.toString()), seed).accounts({
         user,
         depositAuthority,
         systemProgram: web3_js.SystemProgram.programId,
@@ -7570,7 +7593,64 @@ class DepositClient {
         rent: web3_js.SYSVAR_RENT_PUBKEY,
         globalConfig
       }).instruction();
-      return new web3_js.Transaction().add(ix);
+    });
+  }
+  buildSquadsDepositProposalTx(params) {
+    return __async$e(this, null, function* () {
+      var _a, _b, _c, _d;
+      const { connection, multisigPda, amountLamports, wallet } = params;
+      const vaultIndex = (_a = params.vaultIndex) != null ? _a : 0;
+      if (!(wallet == null ? void 0 : wallet.publicKey)) throw new Error("wallet.publicKey missing");
+      if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+      const [vaultPda] = multisig__namespace.getVaultPda({ multisigPda, index: vaultIndex });
+      const depositBuilt = yield this.buildDepositIxForUser(amountLamports, vaultPda);
+      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+      const current = BigInt((_d = (_c = (_b = ms.transactionIndex) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) != null ? _d : 0);
+      const transactionIndex = current + BigInt(1);
+      const { blockhash } = yield connection.getLatestBlockhash("confirmed");
+      const message = new web3_js.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: blockhash,
+        instructions: [depositBuilt.ix]
+      });
+      const createVaultTxIx = yield multisig__namespace.instructions.vaultTransactionCreate({
+        multisigPda,
+        transactionIndex,
+        creator: wallet.publicKey,
+        vaultIndex,
+        ephemeralSigners: 0,
+        transactionMessage: message
+      });
+      console.log("createVaultTxIx", createVaultTxIx);
+      const tx = new web3_js.Transaction().add(createVaultTxIx);
+      return { tx, transactionIndex, vaultPda };
+    });
+  }
+  buildSquadsDepositProposalTx2(params) {
+    return __async$e(this, null, function* () {
+      var _a, _b, _c, _d;
+      const { connection, multisigPda, amountLamports, wallet } = params;
+      const vaultIndex = (_a = params.vaultIndex) != null ? _a : 0;
+      if (!(wallet == null ? void 0 : wallet.publicKey)) throw new Error("wallet.publicKey missing");
+      if (!amountLamports || amountLamports <= BigInt(0)) throw new Error("amountLamports must be > 0");
+      const [vaultPda] = multisig__namespace.getVaultPda({ multisigPda, index: vaultIndex });
+      const depositBuilt = yield this.buildDepositIxForUser(amountLamports, vaultPda);
+      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(connection, multisigPda);
+      const current = BigInt((_d = (_c = (_b = ms.transactionIndex) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)) != null ? _d : 0);
+      const transactionIndex = current + BigInt(1);
+      const { blockhash } = yield connection.getLatestBlockhash("confirmed");
+      new web3_js.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: blockhash,
+        instructions: [depositBuilt.ix]
+      });
+      const createProposalIx = yield multisig__namespace.instructions.proposalCreate({
+        multisigPda,
+        transactionIndex,
+        creator: wallet.publicKey
+      });
+      const tx = new web3_js.Transaction().add(createProposalIx);
+      return { tx, transactionIndex, vaultPda };
     });
   }
   buildWithdrawTx(_0) {
@@ -7589,7 +7669,7 @@ class DepositClient {
       const userAta = splToken.getAssociatedTokenAddressSync(
         liqsolMint,
         user,
-        false,
+        true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
       const userRecord = deriveUserRecordPda(userAta);
@@ -7622,7 +7702,7 @@ class DepositClient {
       const nftAta = splToken.getAssociatedTokenAddressSync(
         nftMint,
         owner,
-        false,
+        true,
         splToken.TOKEN_2022_PROGRAM_ID
       );
       const bucketAuthority = deriveBucketAuthorityPda();
@@ -7661,6 +7741,70 @@ class DepositClient {
       return new web3_js.Transaction().add(ix);
     });
   }
+  buildDepositIxForUser(amount, user) {
+    return __async$e(this, null, function* () {
+      if (!user) {
+        throw new Error("buildDepositIxForUser: user is required");
+      }
+      if (!amount || amount <= BigInt(0)) {
+        throw new Error("buildDepositIxForUser: amount must be > 0");
+      }
+      const depositAuthority = deriveDepositAuthorityPda();
+      const liqsolMint = deriveLiqsolMintPda();
+      const liqsolMintAuthority = deriveLiqsolMintAuthorityPda();
+      const reservePool = deriveReservePoolPda();
+      const vault = deriveVaultPda();
+      const controllerState = deriveStakeControllerStatePda();
+      const payoutState = derivePayoutStatePda();
+      const bucketAuthority = deriveBucketAuthorityPda();
+      const payRateHistory = derivePayRateHistoryPda();
+      const globalConfig = deriveGlobalConfigPda();
+      const userAta = splToken.getAssociatedTokenAddressSync(
+        liqsolMint,
+        user,
+        true,
+        splToken.TOKEN_2022_PROGRAM_ID
+      );
+      const distributionState = deriveDistributionStatePda();
+      const userRecord = 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 deriveEphemeralStakeAddress(user, seed);
+      const ix = 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: 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();
+      return { ix, seed, userAta, ephemeralStake };
+    });
+  }
 }
 
 var __async$d = (__this, __arguments, generator) => {
@@ -8234,7 +8378,7 @@ class DistributionClient {
         const ata = splToken.getAssociatedTokenAddressSync(
           liqsolMint,
           ownerOrAta,
-          false,
+          true,
           splToken.TOKEN_2022_PROGRAM_ID
         );
         const pdaFromWallet = deriveUserRecordPda(ata);
@@ -8577,7 +8721,7 @@ class OutpostClient {
     };
   }
   static tokensToShares(amount, currentIndex) {
-    const numerator = amount.mul(INDEX_SCALE$1);
+    const numerator = amount.mul(new anchor.BN(INDEX_SCALE$1));
     const shares = numerator.div(currentIndex);
     const remainder = numerator.mod(currentIndex);
     return remainder.eqn(0) ? shares : shares.addn(1);
@@ -8841,6 +8985,75 @@ const _SolanaStakingClient = class _SolanaStakingClient {
   get network() {
     return this.config.network;
   }
+  get feePayer() {
+    if (this.signer) return this.signer;
+    if (this.anchor.wallet.publicKey) return this.anchor.wallet.publicKey;
+    throw new Error("No signing authority available");
+  }
+  get squadsX() {
+    var _a;
+    const config = (_a = this.config.extras) == null ? void 0 : _a.squadsX;
+    return config != null ? config : null;
+  }
+  createVaultLiqsolAtaOneShot(params) {
+    return __async$8(this, null, function* () {
+      const { connection, payer, vaultPda } = params;
+      const liqsolMint = deriveLiqsolMintPda();
+      const vaultAta = splToken.getAssociatedTokenAddressSync(
+        liqsolMint,
+        vaultPda,
+        true,
+        splToken.TOKEN_2022_PROGRAM_ID,
+        splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+      const info = yield connection.getAccountInfo(vaultAta, "confirmed");
+      console.log("info?", info);
+      if (info) return null;
+      const ix = splToken.createAssociatedTokenAccountInstruction(
+        payer,
+        vaultAta,
+        vaultPda,
+        liqsolMint,
+        splToken.TOKEN_2022_PROGRAM_ID,
+        splToken.ASSOCIATED_TOKEN_PROGRAM_ID
+      );
+      const tx = new web3_js.Transaction().add(ix);
+      return { tx, vaultAta };
+    });
+  }
+  prepSquadsIxs(ix) {
+    return __async$8(this, null, function* () {
+      var _a, _b, _c, _d;
+      if (!this.squadsX) throw new Error("Attempting to wrap Squads instruction without SquadsX config");
+      const multisigPda = this.squadsMultisigPDA;
+      const vaultPda = this.squadsVaultPDA;
+      const vaultIndex = (_b = (_a = this.squadsX) == null ? void 0 : _a.vaultIndex) != null ? _b : 0;
+      const creator = this.solPubKey;
+      const ms = yield multisig__namespace.accounts.Multisig.fromAccountAddress(this.connection, multisigPda);
+      const current = BigInt((_d = (_c = ms.transactionIndex) == null ? void 0 : _c.toString()) != null ? _d : 0);
+      const transactionIndex = current + BigInt(1);
+      const { blockhash } = yield this.connection.getLatestBlockhash("confirmed");
+      const transactionMessage = new web3_js.TransactionMessage({
+        payerKey: vaultPda,
+        recentBlockhash: blockhash,
+        instructions: [ix]
+      });
+      const createVaultTxIx = yield multisig__namespace.instructions.vaultTransactionCreate({
+        multisigPda,
+        transactionIndex,
+        creator,
+        vaultIndex,
+        transactionMessage,
+        ephemeralSigners: 0
+      });
+      const createProposalIx = yield multisig__namespace.instructions.proposalCreate({
+        multisigPda,
+        transactionIndex,
+        creator
+      });
+      return [createVaultTxIx, createProposalIx];
+    });
+  }
   deposit(amountLamports) {
     return __async$8(this, null, function* () {
       this.ensureUser();
@@ -8849,11 +9062,40 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       }
       try {
         const cuIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 4e5 });
-        const ix = yield this.depositClient.buildDepositTx(amountLamports);
-        const tx = new web3_js.Transaction().add(cuIx, ix);
-        const prepared = yield this.prepareTx(tx);
-        const signed = yield this.signTransaction(prepared.tx);
-        return this.sendAndConfirmHttp(signed, prepared);
+        if (!!this.squadsX) {
+          const createVaultTx = yield 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 web3_js.Transaction().add(createVaultTx.tx);
+            const prepared0 = yield this.prepareTx(tx0);
+            const signed0 = yield this.signTransaction(prepared0.tx);
+            const sent0 = yield this.sendAndConfirmHttp(signed0, prepared0);
+            console.log("create Vault ATA", sent0);
+          }
+          const ix = yield this.depositClient.buildDepositTx(amountLamports, this.squadsVaultPDA);
+          const squadIxs = yield this.prepSquadsIxs(ix);
+          const tx1 = new web3_js.Transaction().add(cuIx, squadIxs[0]);
+          const prepared1 = yield this.prepareTx(tx1);
+          const signed1 = yield this.signTransaction(prepared1.tx);
+          const sent1 = yield this.sendAndConfirmHttp(signed1, prepared1);
+          console.log("SENT 1", sent1);
+          const tx2 = new web3_js.Transaction().add(cuIx, squadIxs[1]);
+          const prepared2 = yield this.prepareTx(tx2);
+          const signed2 = yield this.signTransaction(prepared2.tx);
+          const sent2 = yield this.sendAndConfirmHttp(signed2, prepared2);
+          console.log("SENT 2", sent2);
+          return sent2;
+        } else {
+          const ix = yield this.depositClient.buildDepositTx(amountLamports);
+          const tx = new web3_js.Transaction().add(ix);
+          const prepared = yield this.prepareTx(tx);
+          const signed = yield this.signTransaction(prepared.tx);
+          return this.sendAndConfirmHttp(signed, prepared);
+        }
       } catch (err) {
         throw new Error(`Failed to deposit Solana: ${err}`);
       }
@@ -8939,14 +9181,15 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
       if (!this.pubKey) throw new Error("User pubKey is undefined");
       try {
-        const user = this.solPubKey;
+        const user = !!this.squadsX ? this.squadsVaultPDA : this.solPubKey;
+        console.log("get portfolio for user", user.toBase58());
         const reservePoolPDA = deriveReservePoolPda();
         const vaultPDA = deriveVaultPda();
         const liqsolMint = deriveLiqsolMintPda();
         const userLiqsolAta = splToken.getAssociatedTokenAddressSync(
           liqsolMint,
           user,
-          false,
+          true,
           splToken.TOKEN_2022_PROGRAM_ID,
           splToken.ASSOCIATED_TOKEN_PROGRAM_ID
         );
@@ -9030,6 +9273,18 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       return this.distributionClient.getUserRecord(this.solPubKey);
     });
   }
+  get squadsMultisigPDA() {
+    if (!this.squadsX) return null;
+    return new web3_js.PublicKey(this.squadsX.multisigPDA);
+  }
+  get squadsVaultPDA() {
+    var _a;
+    if (!this.squadsX || !this.squadsMultisigPDA) return null;
+    const multisigPda = this.squadsMultisigPDA;
+    const index = (_a = this.squadsX.vaultIndex) != null ? _a : 0;
+    const pda = multisig__namespace.getVaultPda({ multisigPda, index });
+    return pda[0];
+  }
   getTrancheSnapshot(options) {
     return __async$8(this, null, function* () {
       try {
@@ -9149,8 +9404,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     return __async$8(this, null, function* () {
       var _a, _b, _c, _d;
       this.ensureUser();
-      const payer = this.solPubKey;
-      const balanceLamports = (_a = options == null ? void 0 : options.balanceOverrideLamports) != null ? _a : BigInt(yield this.connection.getBalance(payer, commitment));
+      const balanceLamports = (_a = options == null ? void 0 : options.balanceOverrideLamports) != null ? _a : BigInt(yield this.connection.getBalance(this.feePayer, commitment));
       if (balanceLamports <= BigInt(0)) {
         return BigInt(0);
       }
@@ -9209,7 +9463,7 @@ const _SolanaStakingClient = class _SolanaStakingClient {
       if (this.cachedTxFee && now - this.cachedTxFee.fetchedAt < _SolanaStakingClient.FEE_CACHE_TTL_MS) {
         return this.cachedTxFee.value;
       }
-      const payer = this.solPubKey;
+      const payer = this.feePayer;
       const dummyIx = web3_js.SystemProgram.transfer({
         fromPubkey: payer,
         toPubkey: payer,
@@ -9272,18 +9526,18 @@ const _SolanaStakingClient = class _SolanaStakingClient {
     return __async$8(this, null, function* () {
       const { blockhash, lastValidBlockHeight } = yield this.connection.getLatestBlockhash("confirmed");
       tx.recentBlockhash = blockhash;
-      tx.feePayer = this.solPubKey;
+      tx.feePayer = this.feePayer;
       return { tx, blockhash, lastValidBlockHeight };
     });
   }
   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"
-      );
+    var _a;
+    if (!this.pubKey) throw new Error("User pubKey is undefined");
+    const wallet = (_a = this.anchor) == null ? void 0 : _a.wallet;
+    const pk = wallet == null ? void 0 : wallet.publicKey;
+    if (!pk) throw new Error("Wallet not connected");
+    if (typeof wallet.signTransaction !== "function") {
+      throw new Error("Wallet does not support signTransaction");
     }
   }
 };
@@ -35299,6 +35553,33 @@ class ConvertClient {
       };
     });
   }
+  claimWithdraw(tokenId) {
+    return __async$5(this, null, function* () {
+      var _a, _b;
+      let tx, receipt;
+      try {
+        tx = yield this.contract.DepositManager.claim(tokenId);
+        receipt = yield tx.wait(1);
+      } catch (err) {
+        let errorObj = formatContractErrors(err);
+        throw new Error((_a = errorObj.name) != null ? _a : errorObj.raw);
+      }
+      let event;
+      const ev = (_b = receipt.events) == null ? void 0 : _b.find((e) => e.event === "Claimed");
+      if (ev && ev.args) {
+        const { sender, ethAmount } = ev.args;
+        event = {
+          sender,
+          ethAmount: ethers.BigNumber.from(ethAmount)
+        };
+      }
+      return {
+        txHash: tx.hash,
+        receipt,
+        event
+      };
+    });
+  }
 }
 
 var __async$4 = (__this, __arguments, generator) => {
@@ -35344,12 +35625,13 @@ class StakeClient {
       var _a;
       const depositor = this.contract.Depositor.address;
       const liqRead = this.contract.LiqEthToken;
-      yield liqRead.balanceOf(signerAddress);
+      const bal = yield liqRead.balanceOf(signerAddress);
       const allowance = yield liqRead.allowance(signerAddress, depositor);
       const paused = yield this.contract.Depositor.paused();
       if (paused) {
         throw new Error("Error - Depositor is in a paused state");
       }
+      if (bal.lt(amountWei)) throw new Error("Insufficient LiqETH balance");
       if (allowance.lt(amountWei)) {
         const liqWrite = this.contractService.getWrite("LiqEthToken");
         console.warn(`allowance insufficient (${allowance.toString()} < ${amountWei.toString()}); sending approve(${depositor}, ${amountWei.toString()})`);
@@ -35875,7 +36157,7 @@ class ReceiptClient {
   fetchPreLaunchReceipts(address, type) {
     return __async$1(this, null, function* () {
       const receiptContract = this.contract.ReceiptNFT;
-      const tokenIds = yield this.getOwnedTokenIdsFor(address);
+      const tokenIds = yield this.getOwnedReceiptNFTsFor(address);
       const results = [];
       for (const idBN of tokenIds) {
         try {
@@ -35909,7 +36191,7 @@ class ReceiptClient {
       return results;
     });
   }
-  getOwnedTokenIdsFor(owner, fromBlock = 0, toBlock = "latest") {
+  getOwnedReceiptNFTsFor(owner, fromBlock = 0, toBlock = "latest") {
     return __async$1(this, null, function* () {
       var _a, _b;
       const receiptContract = this.contract.ReceiptNFT;
@@ -35937,6 +36219,61 @@ class ReceiptClient {
       return Array.from(owned).map((id) => ethers.BigNumber.from(id));
     });
   }
+  fetchWithdrawReceipts(address) {
+    return __async$1(this, null, function* () {
+      const tokenIds = yield this.getOwnedWithdrawReceiptsFor(address);
+      const results = [];
+      for (const idBN of tokenIds) {
+        try {
+          const receiptData = yield this.contract.WithdrawalQueue.info(idBN);
+          results.push({
+            tokenId: idBN.toBigInt(),
+            receipt: {
+              ethAmount: receiptData.ethAmount,
+              ethBalance: {
+                amount: receiptData.ethAmount.toBigInt(),
+                decimals: 18,
+                symbol: "ETH"
+              },
+              readyAt: new Date(Number(receiptData.readyAt.toString()) * 1e3).valueOf()
+            }
+          });
+        } catch (err) {
+          console.warn(`Failed to load receipt for tokenId=${idBN.toString()}`, err);
+          continue;
+        }
+      }
+      return results;
+    });
+  }
+  getOwnedWithdrawReceiptsFor(owner, fromBlock = 0, toBlock = "latest") {
+    return __async$1(this, null, function* () {
+      var _a, _b;
+      const contract = this.contract.WithdrawalQueue;
+      const toLogs = yield contract.queryFilter(
+        contract.filters.Transfer(null, owner),
+        fromBlock,
+        toBlock
+      );
+      const fromLogs = yield contract.queryFilter(
+        contract.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 = (__this, __arguments, generator) => {
@@ -36007,6 +36344,21 @@ class EthereumStakingClient {
       return result.txHash;
     });
   }
+  loadPendingWithdraws() {
+    return __async(this, null, function* () {
+      this.ensureUser();
+      const address = yield this.signer.getAddress();
+      return yield this.receiptClient.fetchWithdrawReceipts(address);
+    });
+  }
+  claimWithdraw(tokenId) {
+    return __async(this, null, function* () {
+      this.ensureUser();
+      const tokenIdBigNum = ethers.BigNumber.from(tokenId);
+      const result = yield this.convertClient.claimWithdraw(tokenIdBigNum);
+      return result.txHash;
+    });
+  }
   stake(amount) {
     return __async(this, null, function* () {
       this.ensureUser();
@@ -36076,6 +36428,12 @@ class EthereumStakingClient {
         }
         let estimatedClaim = BigInt(0);
         let estimatedYield = BigInt(0);
+        if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
+          estimatedClaim = userShares * currentIndex / indexScale;
+          if (estimatedClaim > stakeBalanceBN.toBigInt()) {
+            estimatedYield = estimatedClaim - stakeBalanceBN.toBigInt();
+          }
+        }
         const portfolio = {
           native: {
             amount: nativeBalance.toBigInt(),
@@ -36251,11 +36609,9 @@ class Staker {
     if (!Array.isArray(config)) config = [config];
     config.forEach((cfg) => {
       switch (cfg.network.chainId) {
-        case core.SolChainID.Mainnet:
         case core.SolChainID.Devnet:
           this.clients.set(cfg.network.chainId, new SolanaStakingClient(cfg));
           break;
-        case core.EvmChainID.Ethereum:
         case core.EvmChainID.Hoodi:
           this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
           break;