@wireio/stake 1.1.0 → 2.0.0

package/src/networks/ethereum/clients/receipt.client.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from "ethers";
-import { preLaunchReceipt } from "../types";
+import { preLaunchReceipt, WithdrawReceipt } from "../types";
 import { EthereumContractService } from "../contract";
 import { ReceiptNFTKind } from "../../../types";
 
@@ -45,7 +45,7 @@ export class ReceiptClient {
         const receiptContract = this.contract.ReceiptNFT;
 
         // first figure out which tokenIds this address owns, from events
-        const tokenIds = await this.getOwnedTokenIdsFor(address);
+        const tokenIds = await this.getOwnedReceiptNFTsFor(address);
 
         const results: preLaunchReceipt[] = [];
 
@@ -90,7 +90,7 @@ export class ReceiptClient {
 
 
 
-    private async getOwnedTokenIdsFor(
+    private async getOwnedReceiptNFTsFor(
         owner: string,
         fromBlock = 0,
         toBlock: number | string = "latest"
@@ -132,5 +132,83 @@ export class ReceiptClient {
     }
 
 
+    /**
+     * 
+     * @param address (string) to fetch receipts for
+     * @returns preLaunchReceipt[]
+     */
+    async fetchWithdrawReceipts(address: string): Promise<WithdrawReceipt[]> {
+        // first figure out which tokenIds this address owns, from events
+        const tokenIds = await this.getOwnedWithdrawReceiptsFor(address);
+        const results: WithdrawReceipt[] = [];
+
+        // next fetch on-chain token data just for those ids
+        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()) * 1000).valueOf(),
+                    }
+                });
+            } catch (err) {
+                // in case of any mismatch or race, just skip this id
+                console.warn(`Failed to load receipt for tokenId=${idBN.toString()}`, err);
+                continue;
+            }
+        }
+
+        return results;
+    }
+
+
+
+    private async getOwnedWithdrawReceiptsFor(
+        owner: string,
+        fromBlock = 0,
+        toBlock: number | string = "latest"
+    ): Promise<BigNumber[]> {
+        const contract = this.contract.WithdrawalQueue;
+
+        // Logs where address received tokens
+        const toLogs = await contract.queryFilter(
+            contract.filters.Transfer(null, owner),
+            fromBlock,
+            toBlock
+        );
+
+        // Logs where address sent tokens (including burns from owner → 0)
+        const fromLogs = await contract.queryFilter(
+            contract.filters.Transfer(owner, null),
+            fromBlock,
+            toBlock
+        );
 
+        const owned = new Set<string>();
+
+        // Add all received tokenIds
+        for (const e of toLogs) {
+            const tokenId = e.args?.tokenId;
+            if (!tokenId) continue;
+            owned.add(tokenId.toString());
+        }
+
+        // Remove all sent tokenIds
+        for (const e of fromLogs) {
+            const tokenId = e.args?.tokenId;
+            if (!tokenId) continue;
+            owned.delete(tokenId.toString());
+        }
+
+        // Convert to BigNumbers
+        return Array.from(owned).map((id) => BigNumber.from(id));
+    }
 }

package/src/networks/ethereum/clients/stake.client.ts

@@ -45,6 +45,7 @@ export class StakeClient {
             throw new Error("Error - Depositor is in a paused state");
         }
 
+        if (bal.lt(amountWei)) throw new Error("Insufficient LiqETH balance");
 
         // if allowance is less than the requested stake amount, request permission to spend LiqEth
         if (allowance.lt(amountWei)) {