@wireio/stake 0.9.1 → 0.9.2

package/lib/stake.browser.js

@@ -35121,6 +35121,30 @@ class ConvertClient {
       event
     };
   }
+  async claimWithdraw(tokenId) {
+    let tx, receipt;
+    try {
+      tx = await this.contract.DepositManager.claim(tokenId);
+      receipt = await tx.wait(1);
+    } catch (err) {
+      let errorObj = formatContractErrors(err);
+      throw new Error(errorObj.name ?? errorObj.raw);
+    }
+    let event;
+    const ev = receipt.events?.find((e) => e.event === "Claimed");
+    if (ev && ev.args) {
+      const { sender, ethAmount } = ev.args;
+      event = {
+        sender,
+        ethAmount: BigNumber.from(ethAmount)
+      };
+    }
+    return {
+      txHash: tx.hash,
+      receipt,
+      event
+    };
+  }
 }
 
 class StakeClient {
@@ -35141,12 +35165,13 @@ class StakeClient {
   async performStake(amountWei, signerAddress) {
     const depositor = this.contract.Depositor.address;
     const liqRead = this.contract.LiqEthToken;
-    await liqRead.balanceOf(signerAddress);
+    const bal = await liqRead.balanceOf(signerAddress);
     const allowance = await liqRead.allowance(signerAddress, depositor);
     const paused = await 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()})`);
@@ -35591,7 +35616,7 @@ class ReceiptClient {
   }
   async fetchPreLaunchReceipts(address, type) {
     const receiptContract = this.contract.ReceiptNFT;
-    const tokenIds = await this.getOwnedTokenIdsFor(address);
+    const tokenIds = await this.getOwnedReceiptNFTsFor(address);
     const results = [];
     for (const idBN of tokenIds) {
       try {
@@ -35624,7 +35649,7 @@ class ReceiptClient {
     }
     return results;
   }
-  async getOwnedTokenIdsFor(owner, fromBlock = 0, toBlock = "latest") {
+  async getOwnedReceiptNFTsFor(owner, fromBlock = 0, toBlock = "latest") {
     const receiptContract = this.contract.ReceiptNFT;
     const toLogs = await receiptContract.queryFilter(
       receiptContract.filters.Transfer(null, owner),
@@ -35649,6 +35674,56 @@ class ReceiptClient {
     }
     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);
+        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;
+  }
+  async getOwnedWithdrawReceiptsFor(owner, fromBlock = 0, toBlock = "latest") {
+    const contract = this.contract.WithdrawalQueue;
+    const toLogs = await contract.queryFilter(
+      contract.filters.Transfer(null, owner),
+      fromBlock,
+      toBlock
+    );
+    const fromLogs = await contract.queryFilter(
+      contract.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));
+  }
 }
 
 const INITIAL_TRANCHE_SUPPLY = 35e3;
@@ -35695,6 +35770,17 @@ class EthereumStakingClient {
     const result = await this.convertClient.performWithdraw(address, amountWei);
     return result.txHash;
   }
+  async loadPendingWithdraws() {
+    this.ensureUser();
+    const address = await this.signer.getAddress();
+    return await this.receiptClient.fetchWithdrawReceipts(address);
+  }
+  async claimWithdraw(tokenId) {
+    this.ensureUser();
+    const tokenIdBigNum = BigNumber.from(tokenId);
+    const result = await this.convertClient.claimWithdraw(tokenIdBigNum);
+    return result.txHash;
+  }
   async stake(amount) {
     this.ensureUser();
     const walletAddress = await this.signer.getAddress();
@@ -35754,6 +35840,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(),