@wireio/stake 1.2.69 → 1.4.69

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wireio/stake",
-    "version": "1.2.69",
+    "version": "1.4.69",
     "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/instaswap.client.ts

@@ -1,7 +1,7 @@
 import { BigNumber, ethers } from 'ethers';
 
 import { EthereumContractService } from '../contract';
-import { sendOPPFinalize } from '../utils';
+import { resolveContractWriteOverrides, sendOPPFinalize } from '../utils';
 import HoodiLiqEthBridgeArtifact from '../../../assets/ethereum/hoodi/outpost/LiqEthBridge.sol/LiqEthBridge.json';
 
 export type EthereumInstaswapSubmitParams = {
@@ -112,11 +112,18 @@ export class EthereumInstaswapClient {
             minOut,
         );
 
+        const txOverrides = await resolveContractWriteOverrides(
+            depositorWrite,
+            'instaswapCrossChain',
+            [amountIn, destinationChain, destinationAddress, minOut],
+        );
+
         const swapTx = await depositorWrite['instaswapCrossChain'](
             amountIn,
             destinationChain,
             destinationAddress,
             minOut,
+            txOverrides,
         );
         await hooks?.onSubmitted?.(swapTx.hash);
 

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

@@ -1,6 +1,6 @@
 import { BigNumber, ethers } from "ethers";
 import { EthereumContractService } from "../contract";
-import { formatContractErrors, sendOPPFinalize } from "../utils";
+import { formatContractErrors, resolveContractWriteOverrides, sendOPPFinalize } from "../utils";
 
 export class PretokenClient {
     private readonly contractService: EthereumContractService;
@@ -72,7 +72,12 @@ export class PretokenClient {
         // attempt the real purchase call
         let tx, receipt;
         try {
-            tx = await this.contract.Depositor.purchasePretokensWithLiqETH(amountLiq, buyer);
+            const txOverrides = await resolveContractWriteOverrides(
+                this.contract.Depositor,
+                'purchasePretokensWithLiqETH',
+                [amountLiq, buyer],
+            );
+            tx = await this.contract.Depositor.purchasePretokensWithLiqETH(amountLiq, buyer, txOverrides);
             receipt = await tx.wait(1);
         } catch (err: any) {
             let errorObj = formatContractErrors(err);
@@ -162,4 +167,4 @@ export class PretokenClient {
 
     
 
-}
+}

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

@@ -8,7 +8,7 @@ import {
     UnstakeAndWithdrawResult,
 } from "../types";
 import { EthereumContractService } from "../contract";
-import { formatContractErrors } from "../utils";
+import { formatContractErrors, resolveContractWriteOverrides } from "../utils";
 
 export class StakeClient {
 
@@ -63,7 +63,12 @@ export class StakeClient {
         }
 
         // send the tx to stake liqeth
-        const tx = await this.contract.Depositor.stakeLiqETH(amountWei);
+        const txOverrides = await resolveContractWriteOverrides(
+            this.contract.Depositor,
+            'stakeLiqETH',
+            [amountWei],
+        );
+        const tx = await this.contract.Depositor.stakeLiqETH(amountWei, txOverrides);
 
         // Wait for 1 confirmation 
         const receipt = await tx.wait(1);
@@ -136,7 +141,12 @@ export class StakeClient {
         }
 
         // send the tx to stake liqeth
-        const tx = await this.contract.Depositor.stakeLiqETHToWire(amountWei, wireAccount);
+        const txOverrides = await resolveContractWriteOverrides(
+            this.contract.Depositor,
+            'stakeLiqETHToWire',
+            [amountWei, wireAccount],
+        );
+        const tx = await this.contract.Depositor.stakeLiqETHToWire(amountWei, wireAccount, txOverrides);
 
         // Wait for 1 confirmation 
         const receipt = await tx.wait(1);
@@ -209,7 +219,13 @@ export class StakeClient {
             throw new Error(errorObj.name ?? errorObj.raw);
         }
 
-        const tx = await this.contract.Depositor.depositAndStake({ value: amountWei });
+        const txOverrides = await resolveContractWriteOverrides(
+            this.contract.Depositor,
+            'depositAndStake',
+            [],
+            { value: amountWei },
+        );
+        const tx = await this.contract.Depositor.depositAndStake(txOverrides);
         const receipt = await tx.wait(1);
         let staked: StakedEvent | undefined;
         const ev = receipt.events?.find((e: any) => e.event === 'Staked');
@@ -275,7 +291,13 @@ export class StakeClient {
             throw new Error(errorObj.name ?? errorObj.raw);
         }
 
-        const tx = await this.contract.Depositor.depositAndPurchase({ value: amountWei });
+        const txOverrides = await resolveContractWriteOverrides(
+            this.contract.Depositor,
+            'depositAndPurchase',
+            [],
+            { value: amountWei },
+        );
+        const tx = await this.contract.Depositor.depositAndPurchase(txOverrides);
         const receipt = await tx.wait(1);
         return { txHash: tx.hash, receipt };
     }
@@ -293,7 +315,12 @@ export class StakeClient {
             throw new Error(errorObj.name ?? errorObj.raw);
         }
 
-        const tx = await this.contract.Depositor.unstakeAndRequestWithdraw(tokenId);
+        const txOverrides = await resolveContractWriteOverrides(
+            this.contract.Depositor,
+            'unstakeAndRequestWithdraw',
+            [tokenId],
+        );
+        const tx = await this.contract.Depositor.unstakeAndRequestWithdraw(tokenId, txOverrides);
         const receipt = await tx.wait(1);
         return { txHash: tx.hash, receipt };
     }

package/src/networks/ethereum/utils.ts

@@ -16,6 +16,9 @@ export interface CustomContractError {
     raw: string;
 }
 
+const DEFAULT_WRITE_GAS_PADDING_BPS = 2_000;
+const DEFAULT_WRITE_GAS_FALLBACK_LIMIT = ethers.BigNumber.from(8_000_000);
+
 
 
 export function formatContractErrors(err: any): CustomContractError {
@@ -110,6 +113,55 @@ export async function sendOPPFinalize(opp: ethers.Contract, gasLimit?: ethers.Bi
     }
 }
 
+export async function resolveContractWriteOverrides(
+    contract: ethers.Contract,
+    method: string,
+    args: any[] = [],
+    overrides: Record<string, unknown> = {},
+    options?: {
+        fallbackGasLimit?: ethers.BigNumberish;
+        paddingBps?: number;
+    },
+): Promise<Record<string, unknown>> {
+    if (overrides['gasLimit'] != null) {
+        return overrides;
+    }
+
+    const paddingBps = options?.paddingBps ?? DEFAULT_WRITE_GAS_PADDING_BPS;
+    const fallbackGasLimit = ethers.BigNumber.from(
+        options?.fallbackGasLimit ?? DEFAULT_WRITE_GAS_FALLBACK_LIMIT,
+    );
+
+    try {
+        const estimateGas = contract.estimateGas?.[method];
+        if (typeof estimateGas !== 'function') {
+            return {
+                ...overrides,
+                gasLimit: fallbackGasLimit,
+            };
+        }
+
+        const estimated = await estimateGas(...args, overrides);
+        const gasLimit = ethers.BigNumber.from(estimated)
+            .mul(10_000 + paddingBps)
+            .div(10_000);
+
+        return {
+            ...overrides,
+            gasLimit,
+        };
+    } catch (error) {
+        console.warn(
+            `[EthereumGas] estimateGas.${method} failed, using fallback gasLimit ${fallbackGasLimit.toString()}`,
+            error,
+        );
+        return {
+            ...overrides,
+            gasLimit: fallbackGasLimit,
+        };
+    }
+}
+
 
 const BPS_DENOM = BigInt(10_000);
 
@@ -337,4 +389,4 @@ export async function buildEthereumTrancheSnapshot(options: {
         nativePriceTimestamp,
         ladder,
     };
-}
+}

package/src/networks/solana/clients/instaswap.client.ts

@@ -9,7 +9,7 @@ import {
 } from '@solana/web3.js';
 import { getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID } from '@solana/spl-token';
 
-import { buildOutpostAccounts } from '../utils';
+import { buildOutpostAccounts, OutpostAccounts } from '../utils';
 import { LiqsolCoreClientIdl, SolanaProgramService } from '../program';
 import { ConvertClient } from './convert.client';
 
@@ -38,6 +38,46 @@ export type SolanaInstaswapConnectedBalances = {
     liqsolDecimals: number;
 };
 
+export function buildSolanaInstaswapCrossChainAccounts(params: {
+    user: PublicKey;
+    accounts: OutpostAccounts;
+    liqsolCoreProgram: PublicKey;
+    transferHookProgram: PublicKey;
+    pendingAttestations: PublicKey;
+}) {
+    const {
+        user,
+        accounts,
+        liqsolCoreProgram,
+        transferHookProgram,
+        pendingAttestations,
+    } = params;
+
+    return {
+        user,
+        globalState: accounts.globalState,
+        liqsolMint: accounts.liqsolMint,
+        distributionState: accounts.distributionState,
+        userAta: accounts.userAta,
+        senderUserRecord: accounts.userUserRecord,
+        bridgeAuthority: accounts.bridgeAuthority,
+        bridgeVaultAta: accounts.bridgeVaultAta,
+        bridgeUserRecord: accounts.bridgeUserRecord,
+        bridgeState: accounts.bridgeState,
+        extraAccountMetaList: accounts.extraAccountMetaList,
+        liqsolCoreProgram,
+        transferHookProgram,
+        bucketAuthority: accounts.bucketAuthority,
+        bucketTokenAccount: accounts.bucketTokenAccount,
+        bucketUserRecord: accounts.bucketUserRecord,
+        tokenProgram: TOKEN_2022_PROGRAM_ID,
+        systemProgram: SystemProgram.programId,
+        globalConfig: accounts.globalConfig,
+        oppEpochState: accounts.oppEpochState,
+        pendingAttestations,
+    };
+}
+
 export class SolanaInstaswapClient {
     private readonly program: Program<LiqsolCoreClientIdl>;
     private readonly convertClient: ConvertClient;
@@ -81,29 +121,15 @@ export class SolanaInstaswapClient {
                         destinationAddress,
                         minOut,
                     )
-                    .accounts({
-                        user,
-                        globalState: accounts.globalState,
-                        liqsolMint: accounts.liqsolMint,
-                        distributionState: accounts.distributionState,
-                        userAta: accounts.userAta,
-                        senderUserRecord: accounts.userUserRecord,
-                        poolAuthority: accounts.poolAuthority,
-                        liqsolPoolAta: accounts.liqsolPoolAta,
-                        poolUserRecord: accounts.liqsolPoolUserRecord,
-                        bridgeState: accounts.bridgeState,
-                        extraAccountMetaList: accounts.extraAccountMetaList,
-                        liqsolCoreProgram: this.program.programId,
-                        transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
-                        bucketAuthority: accounts.bucketAuthority,
-                        bucketTokenAccount: accounts.bucketTokenAccount,
-                        bucketUserRecord: accounts.bucketUserRecord,
-                        tokenProgram: TOKEN_2022_PROGRAM_ID,
-                        systemProgram: SystemProgram.programId,
-                        globalConfig: accounts.globalConfig,
-                        oppEpochState: accounts.oppEpochState,
-                        pendingAttestations,
-                    })
+                    .accounts(
+                        buildSolanaInstaswapCrossChainAccounts({
+                            user,
+                            accounts,
+                            liqsolCoreProgram: this.program.programId,
+                            transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
+                            pendingAttestations,
+                        }),
+                    )
                     .preInstructions([
                         ComputeBudgetProgram.setComputeUnitLimit({ units: 900_000 }),
                     ])
@@ -126,29 +152,15 @@ export class SolanaInstaswapClient {
                         destinationAddress,
                         minOut,
                     )
-                    .accounts({
-                        user,
-                        globalState: accounts.globalState,
-                        liqsolMint: accounts.liqsolMint,
-                        distributionState: accounts.distributionState,
-                        userAta: accounts.userAta,
-                        senderUserRecord: accounts.userUserRecord,
-                        poolAuthority: accounts.poolAuthority,
-                        liqsolPoolAta: accounts.liqsolPoolAta,
-                        poolUserRecord: accounts.liqsolPoolUserRecord,
-                        bridgeState: accounts.bridgeState,
-                        extraAccountMetaList: accounts.extraAccountMetaList,
-                        liqsolCoreProgram: this.program.programId,
-                        transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
-                        bucketAuthority: accounts.bucketAuthority,
-                        bucketTokenAccount: accounts.bucketTokenAccount,
-                        bucketUserRecord: accounts.bucketUserRecord,
-                        tokenProgram: TOKEN_2022_PROGRAM_ID,
-                        systemProgram: SystemProgram.programId,
-                        globalConfig: accounts.globalConfig,
-                        oppEpochState: accounts.oppEpochState,
-                        pendingAttestations,
-                    })
+                    .accounts(
+                        buildSolanaInstaswapCrossChainAccounts({
+                            user,
+                            accounts,
+                            liqsolCoreProgram: this.program.programId,
+                            transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
+                            pendingAttestations,
+                        }),
+                    )
                     .preInstructions([
                         ComputeBudgetProgram.setComputeUnitLimit({ units: 900_000 }),
                     ])

package/src/networks/solana/clients/outpost.client.ts

@@ -28,6 +28,41 @@ import {
 import { INDEX_SCALE } from '../constants';
 import { LiqsolCoreClientIdl, SolanaProgramService } from '../program';
 
+export function buildSolanaSyndicateAccounts(params: {
+    user: PublicKey;
+    accounts: OutpostAccounts;
+    liqsolCoreProgram: PublicKey;
+    transferHookProgram: PublicKey;
+}) {
+    const { user, accounts, liqsolCoreProgram, transferHookProgram } = params;
+
+    return {
+        user,
+        liqsolMint: accounts.liqsolMint,
+        distributionState: accounts.distributionState,
+        globalState: accounts.globalState,
+        userAta: accounts.userAta,
+        senderUserRecord: accounts.userUserRecord,
+        bridgeAuthority: accounts.bridgeAuthority,
+        bridgeVaultAta: accounts.bridgeVaultAta,
+        bridgeUserRecord: accounts.bridgeUserRecord,
+        bridgeState: accounts.bridgeState,
+        outpostAccount: accounts.outpostAccount,
+        extraAccountMetaList: accounts.extraAccountMetaList,
+        liqsolCoreProgram,
+        transferHookProgram,
+        bucketAuthority: accounts.bucketAuthority,
+        bucketTokenAccount: accounts.bucketTokenAccount,
+        bucketUserRecord: accounts.bucketUserRecord,
+        tokenProgram: TOKEN_2022_PROGRAM_ID,
+        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+        systemProgram: SystemProgram.programId,
+        globalConfig: accounts.globalConfig,
+        oppEpochState: accounts.oppEpochState,
+        pendingAttestations: accounts.pendingAttestations,
+    };
+}
+
 /**
  * OutpostClient
  *
@@ -181,30 +216,14 @@ export class OutpostClient {
 
         return program.methods
             .syndicateLiqsolToWire(wireAccount.trim(), new BN(amountLamports.toString()))
-            .accounts({
-                user,
-                liqsolMint: a.liqsolMint,
-                distributionState: a.distributionState,
-                globalState: a.globalState,
-                userAta: a.userAta,
-                senderUserRecord: a.userUserRecord,
-                poolAuthority: a.poolAuthority,
-                liqsolPoolAta: a.liqsolPoolAta,
-                poolUserRecord: a.liqsolPoolUserRecord,
-                bridgeState: a.bridgeState,
-                extraAccountMetaList: a.extraAccountMetaList,
-                liqsolCoreProgram: this.pgs.PROGRAM_IDS.LIQSOL_CORE,
-                transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
-                bucketAuthority: a.bucketAuthority,
-                bucketTokenAccount: a.bucketTokenAccount,
-                bucketUserRecord: a.bucketUserRecord,
-                tokenProgram: TOKEN_2022_PROGRAM_ID,
-                associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
-                systemProgram: SystemProgram.programId,
-                globalConfig: a.globalConfig,
-                oppEpochState: a.oppEpochState,
-                pendingAttestations: a.pendingAttestations,
-            })
+            .accounts(
+                buildSolanaSyndicateAccounts({
+                    user,
+                    accounts: a,
+                    liqsolCoreProgram: this.pgs.PROGRAM_IDS.LIQSOL_CORE,
+                    transferHookProgram: this.pgs.PROGRAM_IDS.TRANSFER_HOOK,
+                }),
+            )
             .instruction();
     }