@wireio/stake 0.9.1 → 0.9.2

package/lib/stake.d.ts

@@ -333,15 +333,29 @@ interface preLaunchReceipt {
         timestamp: string;
     };
 }
+interface ClaimedEvent {
+    sender: string;
+    ethAmount: BigNumber;
+}
+interface WithdrawReceipt {
+    tokenId: bigint;
+    receipt: {
+        ethAmount: BigNumber;
+        ethBalance: BalanceView;
+        readyAt: number;
+    };
+}
 
 type types$1_AddressBook = AddressBook;
 declare const types$1_CONTRACT_NAMES: typeof CONTRACT_NAMES;
+type types$1_ClaimedEvent = ClaimedEvent;
 type types$1_ContractName = ContractName;
 type types$1_DepositEvent = DepositEvent;
 type types$1_DepositResult = DepositResult;
 type types$1_SharesBurnedEvent = SharesBurnedEvent;
 type types$1_StakedEvent = StakedEvent;
 type types$1_StakedResult = StakedResult;
+type types$1_WithdrawReceipt = WithdrawReceipt;
 type types$1_WithdrawRequestedEvent = WithdrawRequestedEvent;
 type types$1_WithdrawResult = WithdrawResult;
 type types$1_WithdrawnStakeEvent = WithdrawnStakeEvent;
@@ -349,7 +363,7 @@ type types$1_WithdrawnStakeResult = WithdrawnStakeResult;
 type types$1_preLaunchReceipt = preLaunchReceipt;
 declare namespace types$1 {
   export { types$1_CONTRACT_NAMES as CONTRACT_NAMES };
-  export type { types$1_AddressBook as AddressBook, types$1_ContractName as ContractName, types$1_DepositEvent as DepositEvent, types$1_DepositResult as DepositResult, types$1_SharesBurnedEvent as SharesBurnedEvent, types$1_StakedEvent as StakedEvent, types$1_StakedResult as StakedResult, types$1_WithdrawRequestedEvent as WithdrawRequestedEvent, types$1_WithdrawResult as WithdrawResult, types$1_WithdrawnStakeEvent as WithdrawnStakeEvent, types$1_WithdrawnStakeResult as WithdrawnStakeResult, types$1_preLaunchReceipt as preLaunchReceipt };
+  export type { types$1_AddressBook as AddressBook, types$1_ClaimedEvent as ClaimedEvent, types$1_ContractName as ContractName, types$1_DepositEvent as DepositEvent, types$1_DepositResult as DepositResult, types$1_SharesBurnedEvent as SharesBurnedEvent, types$1_StakedEvent as StakedEvent, types$1_StakedResult as StakedResult, types$1_WithdrawReceipt as WithdrawReceipt, types$1_WithdrawRequestedEvent as WithdrawRequestedEvent, types$1_WithdrawResult as WithdrawResult, types$1_WithdrawnStakeEvent as WithdrawnStakeEvent, types$1_WithdrawnStakeResult as WithdrawnStakeResult, types$1_preLaunchReceipt as preLaunchReceipt };
 }
 
 declare const INITIAL_TRANCHE_SUPPLY = 35000;
@@ -406,6 +420,18 @@ declare class EthereumStakingClient implements IStakingClient {
      * @returns transaction hash
      */
     withdraw(amount: bigint): Promise<string>;
+    /**
+     * Withdraw native ETH from the liqETH protocol via the liqeth safeBurn function, which burns the LiqETH and adds the user to the withdrawal queue.
+     * @param amount  Amount in wei (or something convertible to BigNumber).
+     * @returns transaction hash
+     */
+    loadPendingWithdraws(): Promise<WithdrawReceipt[]>;
+    /**
+     * Withdraw native ETH from the liqETH protocol via the liqeth safeBurn function, which burns the LiqETH and adds the user to the withdrawal queue.
+     * @param amount  Amount in wei (or something convertible to BigNumber).
+     * @returns transaction hash
+     */
+    claimWithdraw(tokenId: bigint): Promise<string>;
     /**
      * Stake liqETH via DepositManager.
      * @param amount  Amount in wei - Keep this as a bigint / string in the caller; avoid JS floats.

package/lib/stake.js

@@ -35553,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) => {
@@ -35598,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()})`);
@@ -36129,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 {
@@ -36163,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;
@@ -36191,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) => {
@@ -36261,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();
@@ -36330,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(),