four-flap-meme-sdk 4.4.2 → 4.4.3

package/dist/bundle/four-meme/approve-tokenmanager.js

@@ -50,8 +50,8 @@ function resolveApprovalGasLimit(config) {
     if (config.gasLimit)
         return BigInt(config.gasLimit);
     if (config.gasLimitMultiplier)
-        return BigInt(Math.ceil(60000 * config.gasLimitMultiplier));
-    return 60000n;
+        return BigInt(Math.ceil(150000 * config.gasLimitMultiplier));
+    return 150000n;
 }
 /**
  * 批量授权代币给 TokenManager（用于 Private Buy/Sell）

package/dist/bundle/four-meme/core/create-token-quote.js

@@ -63,11 +63,20 @@ export async function signQuoteApproveIfNeeded(params) {
     if (allowance >= amount)
         return undefined;
     const unsigned = await token.approve.populateTransaction(params.spender, amount);
+    let gasLimit = 150000n;
+    try {
+        const estimated = await provider.estimateGas({ ...unsigned, from: params.wallet.address });
+        if (estimated > 0n)
+            gasLimit = estimated;
+    }
+    catch {
+        /* 估算失败用 15 万，避免代理报价币 8 万不够 */
+    }
     return params.wallet.signTransaction({
         ...unsigned,
         from: params.wallet.address,
         nonce: await params.getNonce(),
-        gasLimit: 80000n,
+        gasLimit,
         gasPrice: params.gasPrice,
         chainId: params.chainId,
         type: params.txType,

package/dist/bundle/four-meme/private/buy-quote.js

@@ -56,11 +56,20 @@ export async function signQuoteApproveTxs(params) {
             continue;
         const token = new Contract(quoteAddress, ERC20_ABI, wallets[i]);
         const unsigned = await token.approve.populateTransaction(spender, amounts[i]);
+        let gasLimit = 150000n;
+        try {
+            const estimated = await provider.estimateGas({ ...unsigned, from: wallets[i].address });
+            if (estimated > 0n)
+                gasLimit = estimated;
+        }
+        catch {
+            /* 估算失败用 15 万 */
+        }
         signed.push(await wallets[i].signTransaction({
             ...unsigned,
             from: wallets[i].address,
             nonce: await nonceManager.getNextNonce(wallets[i]),
-            gasLimit: 80000n,
+            gasLimit,
             gasPrice,
             chainId,
             type: txType,

package/dist/bundle/four-meme/swap-sign-helpers.js

@@ -1,5 +1,6 @@
 import { ethers, Contract } from 'ethers';
 import { getGasLimit } from '../../utils/bundle-helpers.js';
+import { estimateApproveGasLimit } from '../../core/gas/bundle-gas.js';
 import { ADDRESSES, CHAINS, getMulticall3Address } from '../../core/constants/index.js';
 import { MULTICALL3_ABI } from '../../abis/common.js';
 import { batchGetBalances } from '../internal.js';
@@ -85,12 +86,16 @@ export function planSellerNonces(sellerNonces, needBribeTx, needApproval, extrac
 }
 export async function signTmMaxApprovalTx(seller, tokenAddress, approvalNonce, gasPrice, chainIdNum, txType) {
     const approveData = APPROVE_INTERFACE.encodeFunctionData('approve', [TM_ADDRESS, ethers.MaxUint256]);
+    const linked = seller.provider;
+    const gasLimit = linked
+        ? await estimateApproveGasLimit(linked, seller.address, tokenAddress, approveData)
+        : 150000n;
     return seller.signTransaction({
         to: tokenAddress,
         data: approveData,
         value: 0n,
         nonce: approvalNonce,
-        gasLimit: 80000n,
+        gasLimit,
         gasPrice,
         chainId: chainIdNum,
         type: txType,

package/dist/chains/eni/batch-router/bundle-approve.js

@@ -9,6 +9,7 @@ import { Wallet, Interface } from 'ethers';
 import { ENI_CHAIN_ID, ENI_RPC_URL } from '../constants.js';
 import { createEniProvider } from '../../../utils/provider-factory.js';
 import { ERC20_ABI } from '../../../abis/common.js';
+import { estimateApproveGasLimit } from '../../../core/gas/bundle-gas.js';
 const MAX_UINT256 = BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff');
 const erc20Iface = new Interface(ERC20_ABI);
 /**
@@ -33,7 +34,7 @@ export async function batchApprove(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 60000n,
+            gasLimit: await estimateApproveGasLimit(provider, wallet.address, token, calldata),
         });
         return { signedTx, from: wallet.address, nonce };
     }));

package/dist/chains/eni/batch-router/transfer-disperse.js

@@ -14,6 +14,7 @@ import { ERC20_ABI } from '../../../abis/common.js';
 import { getProfitRecipient, calculateTransferFee } from '../../../core/constants/profit.js';
 import { GAS_LIMITS } from '../../../core/constants/gas.js';
 import { erc20Iface, DEFAULT_GAS_PER_SWEEP, GAS_NATIVE_TRANSFER } from './transfer-shared.js';
+import { estimateApproveGasLimit } from '../../../core/gas/bundle-gas.js';
 // ============================================================================
 // 批量分发 EGAS (通过 BatchRouter 合约, 1 笔 tx)
 // ============================================================================
@@ -118,7 +119,7 @@ export async function eniDisperseForSubmit(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 60000n,
+            gasLimit: await estimateApproveGasLimit(provider, mainWallet.address, tokenAddress, erc20Iface.encodeFunctionData('approve', [routerAddr, ethers.MaxUint256])),
         });
         signedTxs.push(approveTx);
     }

package/dist/chains/eni/platforms/dswap/liquidity.js

@@ -173,7 +173,7 @@ export async function addLiquidityETHForSubmit(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 60000n,
+            gasLimit: 150000n,
         });
         signedTxs.push(approveTx);
     }
@@ -280,7 +280,7 @@ export async function removeLiquidityETHForSubmit(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 60000n,
+            gasLimit: 150000n,
         });
         signedTxs.push(approveTx);
     }
@@ -364,7 +364,7 @@ export async function addLiquidityForSubmit(params) {
                 type: 2,
                 maxFeePerGas,
                 maxPriorityFeePerGas,
-                gasLimit: 60000n,
+                gasLimit: 150000n,
             });
             signedTxs.push(approveTx);
         }
@@ -439,7 +439,7 @@ export async function removeLiquidityForSubmit(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 60000n,
+            gasLimit: 150000n,
         });
         signedTxs.push(approveTx);
     }

package/dist/chains/robinhood/sign.js

@@ -17,6 +17,20 @@ export async function signRobinhoodTx(params) {
     if (maxFeePerGas < floor)
         maxFeePerGas = floor;
     const maxPriorityFeePerGas = priority > maxFeePerGas ? maxFeePerGas : priority;
+    let gasLimit = params.gasLimit;
+    try {
+        const estimated = await provider.estimateGas({
+            from: wallet.address,
+            to: params.to,
+            data: params.data,
+            value: params.value ?? 0n,
+        });
+        if (estimated > 0n)
+            gasLimit = estimated;
+    }
+    catch {
+        /* 节点没给出上限时用服务端配置 */
+    }
     const signedTx = await wallet.signTransaction({
         to: params.to,
         value: params.value ?? 0n,
@@ -26,7 +40,7 @@ export async function signRobinhoodTx(params) {
         type: 2,
         maxFeePerGas,
         maxPriorityFeePerGas,
-        gasLimit: params.gasLimit,
+        gasLimit,
     });
     const tx = Transaction.from(signedTx);
     return {

package/dist/core/gas/bundle-gas.d.ts

@@ -52,3 +52,11 @@ export type Eip1559GasFields = {
 };
 export type TxGasFields = LegacyGasFields | Eip1559GasFields;
 export declare function buildGasFields(txType: number, gasPrice: bigint): TxGasFields;
+/** 向节点 eth_estimateGas 要这笔 approve 的 gas 上限。节点没返回时才用 fallback。 */
+export declare function estimateApproveGasLimit(provider: {
+    estimateGas: (tx: {
+        from?: string;
+        to?: string;
+        data?: string;
+    }) => Promise<bigint>;
+}, from: string, to: string, data: string, fallback?: bigint): Promise<bigint>;

package/dist/core/gas/bundle-gas.js

@@ -23,7 +23,7 @@ export async function getOptimizedGasPrice(provider, config) {
     return gasPrice;
 }
 export async function estimateGasWithSafety(provider, txRequest, config) {
-    const multiplier = config?.multiplier ?? 1.2;
+    const multiplier = config?.multiplier ?? 1;
     const fallback = config?.fallbackGasLimit ?? 600000n;
     const allowFailure = config?.allowFailure ?? true;
     try {
@@ -91,3 +91,15 @@ export function buildGasFields(txType, gasPrice) {
     }
     return { type: 0, gasPrice };
 }
+/** 向节点 eth_estimateGas 要这笔 approve 的 gas 上限。节点没返回时才用 fallback。 */
+export async function estimateApproveGasLimit(provider, from, to, data, fallback = 150000n) {
+    try {
+        const estimated = await provider.estimateGas({ from, to, data });
+        if (estimated > 0n)
+            return estimated;
+    }
+    catch {
+        /* 节点没给出上限 */
+    }
+    return fallback;
+}

package/dist/core/tx/wallet-sign-patch.js

@@ -3,16 +3,62 @@
  * 模块加载时 patch Wallet.prototype.signTransaction（全局一次）
  */
 import { Wallet } from 'ethers';
+function chainGasPrice(fee) {
+    const candidates = [fee.maxFeePerGas, fee.gasPrice].filter((v) => v != null && v > 0n);
+    if (candidates.length === 0)
+        return null;
+    return candidates.reduce((a, b) => (a > b ? a : b));
+}
 const _origWalletSign = Wallet.prototype.signTransaction;
 Wallet.prototype.signTransaction = async function (tx) {
-    const signable = tx;
+    let signable = tx;
     if (signable.type === 2 && signable.gasPrice != null && signable.maxFeePerGas == null) {
         const { gasPrice: gp, ...rest } = signable;
-        return _origWalletSign.call(this, {
+        signable = {
             ...rest,
             maxFeePerGas: gp,
             maxPriorityFeePerGas: rest.maxPriorityFeePerGas ?? 0n,
-        });
+        };
     }
-    return _origWalletSign.call(this, tx);
+    const provider = this.provider;
+    if (provider) {
+        const hasPrice = (signable.gasPrice != null && signable.gasPrice > 0n)
+            || (signable.maxFeePerGas != null && signable.maxFeePerGas > 0n);
+        if (!hasPrice) {
+            try {
+                const fee = await provider.getFeeData();
+                const chainPrice = chainGasPrice(fee);
+                if (chainPrice) {
+                    if (signable.type === 2) {
+                        let priority = fee.maxPriorityFeePerGas && fee.maxPriorityFeePerGas > 0n
+                            ? fee.maxPriorityFeePerGas
+                            : chainPrice / 10n || 1n;
+                        if (priority > chainPrice)
+                            priority = chainPrice;
+                        signable = { ...signable, maxFeePerGas: chainPrice, maxPriorityFeePerGas: priority };
+                    }
+                    else {
+                        signable = { ...signable, gasPrice: chainPrice };
+                    }
+                }
+            }
+            catch {
+                /* 节点没给出 gas 价格时保留交易上已有的出价 */
+            }
+        }
+        try {
+            const estimated = await provider.estimateGas({
+                from: signable.from ?? this.address,
+                to: signable.to,
+                data: signable.data,
+                value: signable.value,
+            });
+            if (estimated > 0n)
+                signable = { ...signable, gasLimit: estimated };
+        }
+        catch {
+            /* 节点没给出 gas 上限时保留原来的上限，避免发不出去 */
+        }
+    }
+    return _origWalletSign.call(this, signable);
 };

package/dist/domains/dex/direct-router-v2-buy.js

@@ -3,7 +3,7 @@
  * 从 direct-router-v2.ts 抽取，direct-router-v2.ts 通过 re-export 保持对外不变。
  */
 import { ethers, Wallet, Contract } from 'ethers';
-import { getGasLimit } from '../../core/gas/bundle-gas.js';
+import { estimateApproveGasLimit, getGasLimit } from '../../core/gas/bundle-gas.js';
 import { NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFields, } from '../../utils/bundle-helpers.js';
 import { getProfitRecipient, CHAINS, GAS_LIMITS } from '../../core/constants/index.js';
 import { ERC20_ABI } from '../../abis/common.js';
@@ -88,12 +88,13 @@ export async function directV2BatchBuy(params) {
                 continue;
             if (activeBuyAllowances[i] < activeFlowAmounts[i]) {
                 const approveData = quoteTokenContract.interface.encodeFunctionData('approve', [router, ethers.MaxUint256]);
+                const approveGasLimit = await estimateApproveGasLimit(provider, activeWallets[i].address, inputToken, approveData);
                 const approveTx = await activeWallets[i].signTransaction({
                     to: inputToken,
                     data: approveData,
                     value: 0n,
                     nonce: activeNonces[i],
-                    gasLimit: 60000n,
+                    gasLimit: approveGasLimit,
                     ...buildGasFields(txType, gasPrice),
                     chainId,
                 });

package/dist/domains/dex/direct-router-v2-sell.js

@@ -3,7 +3,7 @@
  * 从 direct-router-v2.ts 抽取，direct-router-v2.ts 通过 re-export 保持对外不变。
  */
 import { ethers, Interface, Wallet, Contract } from 'ethers';
-import { getGasLimit } from '../../core/gas/bundle-gas.js';
+import { estimateApproveGasLimit, getGasLimit } from '../../core/gas/bundle-gas.js';
 import { NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFields, } from '../../utils/bundle-helpers.js';
 import { getProfitRecipient, CHAINS, GAS_LIMITS, getMulticall3Address } from '../../core/constants/index.js';
 import { MULTICALL3_ABI } from '../../abis/common.js';
@@ -124,12 +124,13 @@ export async function directV2BatchSell(params) {
             continue;
         if (allowances[i] < sellAmountsWei[i]) {
             const approveData = tokenContract.interface.encodeFunctionData('approve', [router, ethers.MaxUint256]);
+            const approveGasLimit = await estimateApproveGasLimit(provider, wallets[i].address, tokenIn, approveData);
             const approveTx = await wallets[i].signTransaction({
                 to: tokenIn,
                 data: approveData,
                 value: 0n,
                 nonce: nonces[i],
-                gasLimit: 60000n,
+                gasLimit: approveGasLimit,
                 ...buildGasFields(txType, gasPrice),
                 chainId,
             });

package/dist/domains/flap/portal-bundle/helpers.js

@@ -38,7 +38,7 @@ export function getErrorMessage(key, ...args) {
  */
 export async function estimateGasWithMultiplier(provider, txRequest, multiplier) {
     const estimated = await provider.estimateGas(txRequest);
-    const mult = multiplier ?? 1.2; // 默认 20% 安全余量
+    const mult = multiplier ?? 1;
     return BigInt(Math.ceil(Number(estimated) * mult));
 }
 /**

package/dist/domains/flap/portal-bundle-merkle/swap-planning.js

@@ -5,6 +5,7 @@ import { ZERO_ADDRESS, calculateBundleSwapRoundTripProfit } from '../../../core/
 import { ERC20_ALLOWANCE_ABI } from '../../../core/shared-abis/common.js';
 import { getGasPriceConfig, getTxType, getProfitRecipient, PORTAL_ABI } from './config.js';
 import { getErrorMessageFromUnknown } from '../../../core/index.js';
+import { estimateApproveGasLimit } from '../../../core/gas/bundle-gas.js';
 import { createSignProvider } from '../../../bundle/sign-context-helpers.js';
 import { batchGetBalances } from '../../../bundle/internal.js';
 import { APPROVE_INTERFACE, ERC20_BALANCE_OF_ABI, getChainId, getNativeTokenName, } from './swap-helpers.js';
@@ -38,12 +39,14 @@ export async function buildApprovalTransaction({ tokenAddress, seller, provider,
     const approvalNonce = await nonceManager.getNextNonce(seller);
     const gasPrice = await getOptimizedGasPrice(provider, getGasPriceConfig(config));
     const txType = getTxType(config);
+    const approveData = APPROVE_INTERFACE.encodeFunctionData('approve', [portalAddress, ethers.MaxUint256]);
+    const gasLimit = await estimateApproveGasLimit(provider, seller.address, tokenAddress, approveData);
     return await seller.signTransaction({
         to: tokenAddress,
-        data: APPROVE_INTERFACE.encodeFunctionData('approve', [portalAddress, ethers.MaxUint256]),
+        data: approveData,
         value: 0n,
         nonce: approvalNonce,
-        gasLimit: 80000n,
+        gasLimit,
         gasPrice,
         chainId,
         type: txType,

package/dist/domains/four/contracts/tm-bundle-create.js

@@ -136,11 +136,23 @@ export async function createTokenWithBundleBuy(params) {
         const amount = ethers.parseUnits(preSaleStr, decimals);
         if (allowance < amount) {
             const approveUnsigned = await quote.approve.populateTransaction(tmAddr, amount);
+            let approveGasLimit = 150000n;
+            try {
+                const estimatedApprove = await provider.estimateGas({
+                    ...approveUnsigned,
+                    from: devWallet.address,
+                });
+                if (estimatedApprove > 0n)
+                    approveGasLimit = estimatedApprove;
+            }
+            catch {
+                /* 估算失败用 15 万 */
+            }
             const signedApprove = await devWallet.signTransaction({
                 ...approveUnsigned,
                 from: devWallet.address,
                 nonce: await getNextNonce(devWallet),
-                gasLimit: 80000n,
+                gasLimit: approveGasLimit,
                 gasPrice,
                 chainId: CHAINS.BSC.chainId,
                 type: 0,

package/dist/domains/four/contracts/tm-bundle-helpers.js

@@ -41,7 +41,7 @@ export async function waitForBundleWithProvider(provider, firstTxSigned, _bundle
  */
 export async function estimateGasWithMultiplier(provider, txRequest, multiplier) {
     const estimated = await provider.estimateGas(txRequest);
-    const mult = multiplier ?? 1.2; // 默认 20% 安全余量
+    const mult = multiplier ?? 1;
     return BigInt(Math.ceil(Number(estimated) * mult));
 }
 /**

package/dist/domains/holders/internal/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const ERC20_TRANSFER_GAS_LIMIT: 120000n;
 /** SPCXB 等股票币 approve 实测 >50k，空钱包 eth_estimate ~55k */
-export declare const ERC20_APPROVE_GAS_LIMIT = 80000n;
+export declare const ERC20_APPROVE_GAS_LIMIT = 150000n;
 export declare const DEFAULT_GAS_LIMIT = 800000;
 export declare const DEFAULT_GAS_PRICE_GWEI = 3;
 export declare const GAS_BUFFER_MULTIPLIER = 2;

package/dist/domains/holders/internal/constants.js

@@ -1,7 +1,7 @@
 import { GAS_LIMITS } from '../../../core/constants/index.js';
 export const ERC20_TRANSFER_GAS_LIMIT = GAS_LIMITS.ERC20_TRANSFER;
 /** SPCXB 等股票币 approve 实测 >50k，空钱包 eth_estimate ~55k */
-export const ERC20_APPROVE_GAS_LIMIT = 80000n;
+export const ERC20_APPROVE_GAS_LIMIT = 150000n;
 export const DEFAULT_GAS_LIMIT = 800000;
 export const DEFAULT_GAS_PRICE_GWEI = 3;
 export const GAS_BUFFER_MULTIPLIER = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",