@wireio/stake 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wireio/stake",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "LIQ Staking Module for Wire Network",
     "homepage": "https://gitea.gitgo.app/Wire/sdk-stake",
     "license": "FSL-1.1-Apache-2.0",

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

@@ -84,34 +84,33 @@ export class OPPClient {
         };
     }
 
-    
-
-
     /**
      * Fetches all OPPMessage events and flattens all assertions into a single OPPAssertion[] array.
      */
     async getMessages(address: string): Promise<OPPAssertion[]> {
-        const oppMessageFilter = this.contract.OPP.filters.OPPMessage();
-        const events = await this.contract.OPP.queryFilter(oppMessageFilter, 0, "latest");
-        const allAssertions: OPPAssertion[] = [];
-        for (const event of events) {
-            const assertions = await this.extractAssertionsFromEvent(event);
-            allAssertions.push(...assertions);
-        }
+        try {
+            const oppMessageFilter = this.contract.OPP.filters.OPPMessage();
+            const events = await this.contract.OPP.queryFilter(oppMessageFilter, 0, "latest");
+            const allAssertions: OPPAssertion[] = [];
+            for (const event of events) {
+                const assertions = await this.extractAssertionsFromEvent(event);
+                allAssertions.push(...assertions);
+            }
 
-        // ! Current implementation is not ideal - no current way to filter OPP Messages by a single user
-        const normalized = address ? address.toLowerCase() : null;
-        const filtered = allAssertions.filter(a =>
-            (a.from && a.from.toLowerCase() === normalized) ||
-            (a.to && a.to.toLowerCase() === normalized)
-        );
-        return filtered.reverse();
+            // ! Current implementation is not ideal - no current way to filter OPP Messages by a single user
+            const normalized = address ? address.toLowerCase() : null;
+            const filtered = allAssertions.filter(a =>
+                (a.from && a.from.toLowerCase() === normalized) ||
+                (a.to && a.to.toLowerCase() === normalized)
+            );
+            return filtered.reverse();
+        }
+        catch (error) {
+            // console.log('Error fetching OPP messages:', error);
+            return [];
+        }
     }
 
-
-
-
-
     /**
      * Extracts all OPPAssertions from a single OPPMessage event, attaching event metadata to each.
      */

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

@@ -20,7 +20,14 @@ export class ReceiptClient {
     }
 
     async stakeReceipts(address: string): Promise<preLaunchReceipt[]> {
-        return this.fetchPreLaunchReceipts(address, ReceiptNFTKind.STAKE);
+        try {
+            const receipts = await this.fetchPreLaunchReceipts(address, ReceiptNFTKind.STAKE);
+            return receipts;
+        }
+        catch (err) {
+            // console.log('Error fetching stake receipts:', err);
+            return [];
+        }
     }
     
     async pretokenReceipts(address: string): Promise<preLaunchReceipt[]> {

package/src/networks/ethereum/ethereum.ts

@@ -160,100 +160,109 @@ export class EthereumStakingClient implements IStakingClient {
      * tracked = liqETH tracked balance (protocol/accounting view)
      */
     async getPortfolio(): Promise<Portfolio | null> {
-        if (!this.signer) return Promise.resolve(null);
 
-        const walletAddress = await this.signer!.getAddress();
+        try {
+            if (!this.signer) return Promise.resolve(null);
 
-        // 1) Native ETH balance
-        const nativeBalance = await this.provider.getBalance(walletAddress);
-        const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
-        const nativeSymbol = this.network?.nativeCurrency?.symbol ?? 'ETH';
+            const walletAddress = await this.signer!.getAddress();
 
-        // 2) liqETH ERC-20 balance (actual)
-        const liqBalance: ethers.BigNumber = await this.contract.LiqEthToken.balanceOf(walletAddress);
-        const liqSymbol = 'Liq' + (this.network?.nativeCurrency?.symbol ?? 'ETH');
+            // 1) Native ETH balance
+            const nativeBalance = await this.provider.getBalance(walletAddress);
+            const nativeDecimals = this.network?.nativeCurrency?.decimals ?? 18;
+            const nativeSymbol = this.network?.nativeCurrency?.symbol ?? 'ETH';
 
-        // 3) staked liqEth ERC-20 balance (calculate from receipts)
-        let stakeReceipts = await this.receiptClient.stakeReceipts(walletAddress);
-        let stakeBalanceBN = BigNumber.from(0);
-        for (let r of stakeReceipts) {
-            stakeBalanceBN = stakeBalanceBN.add(BigNumber.from(r.receipt.principal.amount));
-        }
-        let stakeSharesBN = BigNumber.from(0);
-        for (let r of stakeReceipts) {
-            stakeSharesBN = stakeSharesBN.add(BigNumber.from(r.receipt.shares.amount));
-        }
+            // 2) liqETH ERC-20 balance (actual)
+            const liqBalance: ethers.BigNumber = await this.contract.LiqEthToken.balanceOf(walletAddress);
+            const liqSymbol = 'Liq' + (this.network?.nativeCurrency?.symbol ?? 'ETH');
 
-        // 4) WIRE pretoken balance
-        const wireBalance: ethers.BigNumber = await this.contract.Pretoken.balanceOf(walletAddress);
+            // 3) staked liqEth ERC-20 balance (calculate from receipts)
+            let stakeReceipts = await this.receiptClient.stakeReceipts(walletAddress);
 
+            let stakeBalanceBN = BigNumber.from(0);
+            for (let r of stakeReceipts) {
+                stakeBalanceBN = stakeBalanceBN.add(BigNumber.from(r.receipt.principal.amount));
+            }
+            let stakeSharesBN = BigNumber.from(0);
+            for (let r of stakeReceipts) {
+                stakeSharesBN = stakeSharesBN.add(BigNumber.from(r.receipt.shares.amount));
+            }
 
-        // 5) Calculate staking yield 
-        let currentIndex = BigInt(0);
-        let totalShares = BigInt(0);
-        let userShares = BigInt(0);
-        const indexScale = BigInt(1e27);
-        try {
-            // These may throw if not implemented on contract
-            const [indexBn, totalSharesBn] = await Promise.all([
-                this.contract.Depositor.index().catch(() => BigNumber.from(0)),
-                this.contract.Depositor.totalShares().catch(() => BigNumber.from(0)),
-            ]);
+            // 4) WIRE pretoken balance
+            const wireBalance: ethers.BigNumber = await this.contract.Pretoken.balanceOf(walletAddress);
+
+            // 5) Calculate staking yield 
+            let currentIndex = BigInt(0);
+            let totalShares = BigInt(0);
+            let userShares = BigInt(0);
+            const indexScale = BigInt(1e27);
+            try {
+                // These may throw if not implemented on contract
+                const [indexBn, totalSharesBn] = await Promise.all([
+                    this.contract.Depositor.index().catch(() => BigNumber.from(0)),
+                    this.contract.Depositor.totalShares().catch(() => BigNumber.from(0)),
+                ]);
+
+                const userSharesBn = stakeSharesBN;
+                currentIndex = BigInt(indexBn.toString());
+                totalShares = BigInt(totalSharesBn.toString());
+                userShares = BigInt(userSharesBn.toString());
+            } catch (error) {
+                console.log('Error fetching staking index/shares:', error);
+            }
 
-            const userSharesBn = stakeSharesBN;
-            currentIndex = BigInt(indexBn.toString());
-            totalShares = BigInt(totalSharesBn.toString());
-            userShares = BigInt(userSharesBn.toString());
-        } catch { }
-
-        // sharesToTokens(userShares, currentIndex) = userShares * currentIndex / indexScale
-        let estimatedClaim = BigInt(0);
-        let estimatedYield = BigInt(0);
-
-        // started work on estimating the user's personal APY - not necessary at the moment
-        // let estimatedAPY: number | null = null;
-        // if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
-        //     estimatedClaim = (userShares * currentIndex) / indexScale;
-        //     if (estimatedClaim > stakeBalanceBN.toBigInt()) {
-        //         estimatedYield = estimatedClaim - stakeBalanceBN.toBigInt();
-        //     }
-
-        //     estimatedAPY = null;
-        // }
-
-        const portfolio: Portfolio = {
-            native: {
-                amount: nativeBalance.toBigInt(),
-                decimals: nativeDecimals,
-                symbol: nativeSymbol,
-            },
-            liq: {
-                amount: liqBalance.toBigInt(),
-                decimals: nativeDecimals,
-                symbol: liqSymbol,
-            },
-            staked: {
-                amount: stakeBalanceBN.toBigInt(),
-                decimals: nativeDecimals,
-                symbol: liqSymbol,
-            },
-            wire: {
-                amount: wireBalance.toBigInt(),
-                decimals: 18,
-                symbol: '$WIRE',
-            },
-
-            yield: {
-                currentIndex,
-                indexScale,
-                totalShares,
-                userShares,
-                estimatedClaim,
-                estimatedYield,
-            },
-            chainID: this.network.chainId
+            // sharesToTokens(userShares, currentIndex) = userShares * currentIndex / indexScale
+            let estimatedClaim = BigInt(0);
+            let estimatedYield = BigInt(0);
+
+            // started work on estimating the user's personal APY - not necessary at the moment
+            // let estimatedAPY: number | null = null;
+            // if (userShares > BigInt(0) && currentIndex > BigInt(0)) {
+            //     estimatedClaim = (userShares * currentIndex) / indexScale;
+            //     if (estimatedClaim > stakeBalanceBN.toBigInt()) {
+            //         estimatedYield = estimatedClaim - stakeBalanceBN.toBigInt();
+            //     }
+
+            //     estimatedAPY = null;
+            // }
+
+            const portfolio: Portfolio = {
+                native: {
+                    amount: nativeBalance.toBigInt(),
+                    decimals: nativeDecimals,
+                    symbol: nativeSymbol,
+                },
+                liq: {
+                    amount: liqBalance.toBigInt(),
+                    decimals: nativeDecimals,
+                    symbol: liqSymbol,
+                },
+                staked: {
+                    amount: stakeBalanceBN.toBigInt(),
+                    decimals: nativeDecimals,
+                    symbol: liqSymbol,
+                },
+                wire: {
+                    amount: wireBalance.toBigInt(),
+                    decimals: 18,
+                    symbol: '$WIRE',
+                },
+
+                yield: {
+                    currentIndex,
+                    indexScale,
+                    totalShares,
+                    userShares,
+                    estimatedClaim,
+                    estimatedYield,
+                },
+                chainID: this.network.chainId
+            }
+            return portfolio;
+        }
+        catch (error) {
+            // console.log('Error fetching Ethereum portfolio:', error);
+            throw error;
         }
-        return portfolio;
     }
 
     /**
@@ -422,7 +431,7 @@ export class EthereumStakingClient implements IStakingClient {
         txCount?: number;
         safetyMultiplier?: number;
         minBufferWei?: bigint;
-        balanceOverrideLamports?: bigint; 
+        balanceOverrideLamports?: bigint;
     }): Promise<bigint> {
         this.ensureUser();
 

package/src/networks/solana/solana.ts

@@ -208,14 +208,18 @@ export class SolanaStakingClient implements IStakingClient {
         }
 
         try {
-            const tx = await this.depositClient.buildDepositTx(amountLamports);
-            const { tx: prepared, blockhash, lastValidBlockHeight } =
-                await this.prepareTx(tx);
-            const signed = await this.signTransaction(prepared);
-            return await this.sendAndConfirmHttp(signed, {
-                blockhash,
-                lastValidBlockHeight,
-            });
+            // Build compute budget increase instruction
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+
+            // Build the Outpost synd instruction
+            const ix = await this.depositClient.buildDepositTx(amountLamports);
+
+            // Wrap in a transaction and send
+            const tx = new Transaction().add(cuIx, ix);
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
+
+            return this.sendAndConfirmHttp(signed, prepared);
         } catch (err) {
             throw new Error(`Failed to deposit Solana: ${err}`);
         }
@@ -238,14 +242,18 @@ export class SolanaStakingClient implements IStakingClient {
         }
 
         try {
-            const tx = await this.depositClient.buildWithdrawTx(amountLamports);
-            const { tx: prepared, blockhash, lastValidBlockHeight } =
-                await this.prepareTx(tx);
-            const signed = await this.signTransaction(prepared);
-            return await this.sendAndConfirmHttp(signed, {
-                blockhash,
-                lastValidBlockHeight,
-            });
+            // Build compute budget increase instruction
+            const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
+
+            // Build the Outpost synd instruction
+            const ix = await this.depositClient.buildWithdrawTx(amountLamports);
+
+            // Wrap in a transaction and send
+            const tx = new Transaction().add(cuIx, ix);
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
+
+            return this.sendAndConfirmHttp(signed, prepared);
         } catch (err) {
             throw new Error(`Failed to withdraw Solana: ${err}`);
         }
@@ -328,14 +336,12 @@ export class SolanaStakingClient implements IStakingClient {
             const user = this.solPubKey;
             const cuIx = ComputeBudgetProgram.setComputeUnitLimit({ units: 400_000 });
             const ix = await this.tokenClient.buildPurchaseIx(amountLamports, user);
+
             const tx = new Transaction().add(cuIx, ix);
-            const { tx: prepared, blockhash, lastValidBlockHeight } =
-                await this.prepareTx(tx);
-            const signed = await this.signTransaction(prepared);
-            return await this.sendAndConfirmHttp(signed, {
-                blockhash,
-                lastValidBlockHeight,
-            });
+            const prepared = await this.prepareTx(tx);
+            const signed = await this.signTransaction(prepared.tx);
+
+            return this.sendAndConfirmHttp(signed, prepared);
         }
         catch (err) {
             throw new Error(`Failed to buy liqSOL pretokens: ${err}`);

package/src/staker.ts

@@ -41,6 +41,7 @@ export class Staker {
                     break;
 
                 case EvmChainID.Ethereum:
+                case EvmChainID.Hoodi:
                     this.clients.set(cfg.network.chainId, new EthereumStakingClient(cfg));
                     break;