four-flap-meme-sdk 4.5.0 → 4.5.2

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

@@ -7,6 +7,7 @@ import { CHAINS, getMulticall3Address } from '../../../core/constants/index.js';
 import { buildCreateTokenReq } from '../../../core/clients/four.js';
 import { computeFourCreateValueWei, isNativeRaisedToken, } from '../../../domains/four/raised-token.js';
 import { PLATFORM_CREATE_FEE } from './constants.js';
+import { withGasHeadroom } from '../../../core/gas/bundle-gas.js';
 export async function resolveCreateRaisedToken(fourClient, tokenInfo) {
     if (tokenInfo.raisedToken)
         return tokenInfo.raisedToken;
@@ -67,7 +68,7 @@ export async function signQuoteApproveIfNeeded(params) {
     try {
         const estimated = await provider.estimateGas({ ...unsigned, from: params.wallet.address });
         if (estimated > 0n)
-            gasLimit = estimated;
+            gasLimit = withGasHeadroom(estimated);
     }
     catch {
         /* 估算失败用 15 万，避免代理报价币 8 万不够 */

package/dist/bundle/four-meme/core/sell-flow.js

@@ -2,7 +2,7 @@
  * Four.meme Bundle 核心方法 — 批量卖出流程
  */
 import { ethers, Contract, Interface } from 'ethers';
-import { getGasLimit } from '../../../core/gas/bundle-gas.js';
+import { getGasLimit, withGasHeadroom } from '../../../core/gas/bundle-gas.js';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
 import { ADDRESSES, CHAINS, applySlippageBps, reverseSlippageBps } from '../../../core/constants/index.js';
 import { MULTICALL3_ABI } from '../../../abis/common.js';
@@ -98,7 +98,7 @@ async function executeSellFlow(options) {
                 from: wallets[0].address,
             });
             if (estimated > 0n)
-                sellGasLimit = estimated;
+                sellGasLimit = withGasHeadroom(estimated);
         }
         catch {
             /* 估算失败继续用配置上限 */

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

@@ -5,6 +5,7 @@ import { Contract, parseEther, parseUnits } from 'ethers';
 import { ADDRESSES, ZERO_ADDRESS } from '../../../core/constants/index.js';
 import { ERC20_ABI } from '../../../abis/common.js';
 import { batchCheckAllowances } from '../../../core/erc20/index.js';
+import { withGasHeadroom } from '../../../core/gas/bundle-gas.js';
 const HELPER_TRY_BUY_ABI = [
     'function tryBuy(address token, uint256 amount, uint256 funds) view returns (address tokenManager, address quote, uint256 estimatedAmount, uint256 estimatedCost, uint256 estimatedFee, uint256 amountMsgValue, uint256 amountApproval, uint256 amountFunds)',
 ];
@@ -60,7 +61,7 @@ export async function signQuoteApproveTxs(params) {
         try {
             const estimated = await provider.estimateGas({ ...unsigned, from: wallets[i].address });
             if (estimated > 0n)
-                gasLimit = estimated;
+                gasLimit = withGasHeadroom(estimated);
         }
         catch {
             /* 估算失败用 15 万 */

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

@@ -9,6 +9,7 @@ import { NonceManager, getOptimizedGasPrice, getGasPriceConfig, buildProfitHopTr
 import { getBribeAmount, getProfitRecipient } from '../../config-helpers.js';
 import { calculateBundleSwapRoundTripProfit } from '../../../core/constants/index.js';
 import { TM_ABI, TM_ADDRESS } from '../swap-internal.js';
+import { withGasHeadroom } from '../../../core/gas/bundle-gas.js';
 /**
  * Four内盘捆绑换手
  */
@@ -82,9 +83,9 @@ export async function fourBundleSwapMerkle(params) {
             provider.estimateGas({ ...buyUnsigned, from: buyer.address, value: buyerFunds }),
         ]);
         if (sellGas > 0n)
-            sellGasLimit = sellGas;
+            sellGasLimit = withGasHeadroom(sellGas);
         if (buyGas > 0n)
-            buyGasLimit = buyGas;
+            buyGasLimit = withGasHeadroom(buyGas);
     }
     catch {
         /* 估算失败继续用配置上限 */

package/dist/chains/robinhood/sign.js

@@ -3,6 +3,7 @@
  */
 import { JsonRpcProvider, Transaction, Wallet } from 'ethers';
 import { ROBINHOOD_CHAIN_ID, ROBINHOOD_RPC_URL } from './constants.js';
+import { withGasHeadroom } from '../../core/gas/bundle-gas.js';
 export async function signRobinhoodTx(params) {
     const rpcUrl = params.rpcUrl ?? ROBINHOOD_RPC_URL;
     const provider = new JsonRpcProvider(rpcUrl, ROBINHOOD_CHAIN_ID, { staticNetwork: true });
@@ -25,8 +26,10 @@ export async function signRobinhoodTx(params) {
             data: params.data,
             value: params.value ?? 0n,
         });
-        if (estimated > 0n)
-            gasLimit = estimated;
+        if (estimated > 0n) {
+            const isCall = params.data != null && params.data !== '0x';
+            gasLimit = isCall ? withGasHeadroom(estimated) : estimated;
+        }
     }
     catch {
         /* 节点没给出上限时用服务端配置 */

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,12 @@
+import { describe, expect, it } from 'vitest';
+import { estimateApproveGasLimit, estimateGasWithSafety, withGasHeadroom } from './bundle-gas.js';
+describe('gas headroom', () => {
+    it('估算结果默认留 20% 余量（捆绑后面的交易状态会变，刚好够会 OutOfGas）', async () => {
+        expect(withGasHeadroom(273241n)).toBe(327889n);
+        expect(withGasHeadroom(0n)).toBe(0n);
+        const provider = { estimateGas: async () => 100000n };
+        expect(await estimateApproveGasLimit(provider, '0x1', '0x2', '0x')).toBe(120000n);
+        expect(await estimateGasWithSafety(provider, {})).toBe(120000n);
+        expect(await estimateGasWithSafety(provider, {}, { multiplier: 1 })).toBe(100000n);
+    });
+});

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

@@ -11,6 +11,13 @@ export interface GasEstimateConfig {
     fallbackGasLimit?: bigint;
     allowFailure?: boolean;
 }
+/**
+ * eth_estimateGas 按 latest 状态给「刚好够」的值。捆绑里排在后面的交易执行时，前面的买卖已经改了
+ * 池子 / 税币状态，实际用量会更高；刚好够的上限会 OutOfGas，BlockRazor 整包判成
+ * non-reverting tx in bundle failed。所有估算都加 20% 余量（4.4.3 去掉后大量捆绑失败）。
+ */
+export declare const GAS_HEADROOM_PERCENT = 120n;
+export declare function withGasHeadroom(gas: bigint): bigint;
 export declare function estimateGasWithSafety(provider: JsonRpcProvider, txRequest: TransactionRequest, config?: GasEstimateConfig): Promise<bigint>;
 export declare function estimateGasBatch(provider: JsonRpcProvider, txRequests: TransactionRequest[], config?: GasEstimateConfig): Promise<bigint[]>;
 export interface BuildTransactionOptions {

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

@@ -22,8 +22,19 @@ export async function getOptimizedGasPrice(provider, config) {
     }
     return gasPrice;
 }
+/**
+ * eth_estimateGas 按 latest 状态给「刚好够」的值。捆绑里排在后面的交易执行时，前面的买卖已经改了
+ * 池子 / 税币状态，实际用量会更高；刚好够的上限会 OutOfGas，BlockRazor 整包判成
+ * non-reverting tx in bundle failed。所有估算都加 20% 余量（4.4.3 去掉后大量捆绑失败）。
+ */
+export const GAS_HEADROOM_PERCENT = 120n;
+export function withGasHeadroom(gas) {
+    if (gas <= 0n)
+        return gas;
+    return (gas * GAS_HEADROOM_PERCENT) / 100n;
+}
 export async function estimateGasWithSafety(provider, txRequest, config) {
-    const multiplier = config?.multiplier ?? 1;
+    const multiplier = config?.multiplier ?? 1.2;
     const fallback = config?.fallbackGasLimit ?? 600000n;
     const allowFailure = config?.allowFailure ?? true;
     try {
@@ -96,7 +107,7 @@ export async function estimateApproveGasLimit(provider, from, to, data, fallback
     try {
         const estimated = await provider.estimateGas({ from, to, data });
         if (estimated > 0n)
-            return estimated;
+            return withGasHeadroom(estimated);
     }
     catch {
         /* 节点没给出上限 */

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

@@ -3,6 +3,7 @@
  * 模块加载时 patch Wallet.prototype.signTransaction（全局一次）
  */
 import { Wallet } from 'ethers';
+import { withGasHeadroom } from '../gas/bundle-gas.js';
 function chainGasPrice(fee) {
     const candidates = [fee.maxFeePerGas, fee.gasPrice].filter((v) => v != null && v > 0n);
     if (candidates.length === 0)
@@ -63,8 +64,10 @@ Wallet.prototype.signTransaction = async function (tx) {
                     data: signable.data,
                     value: signable.value,
                 });
-                if (estimated > 0n)
-                    signable = { ...signable, gasLimit: estimated };
+                if (estimated > 0n) {
+                    const isCall = signable.data != null && signable.data !== '0x';
+                    signable = { ...signable, gasLimit: isCall ? withGasHeadroom(estimated) : estimated };
+                }
             }
             catch {
                 /* 节点没给出 gas 上限时保留原来的上限，避免发不出去 */

package/dist/domains/dex/direct-router-approvals.d.ts

@@ -0,0 +1,28 @@
+/**
+ * V2/V3 直连 Router 卖出/买入前的自动授权。
+ *
+ * 与 V2 路径保持一致：钱包对 Router 的 allowance 不足时，在该钱包的起始 nonce 上
+ * 插入一笔 `approve(spender, MaxUint256)`，并按顺序把后续交易 nonce 顺延。
+ *
+ * 背景：BlockRazor 的 bundle 要求包内交易都不能回滚。漏掉授权时，卖出的
+ * `TransferHelper.safeTransferFrom` 会直接 STF 回滚，整包被拒（表现为
+ * `non-reverting tx in bundle failed`），而且不会指出是哪一笔。
+ */
+import { type JsonRpcProvider, type Wallet } from 'ethers';
+export interface SignMissingAllowanceApprovalsParams {
+    provider: JsonRpcProvider;
+    wallets: Wallet[];
+    /** 会被原地修改：插入 approve 的钱包 nonce +1，后续交易自动顺延 */
+    nonces: number[];
+    tokenAddress: string;
+    spender: string;
+    /** 与 wallets 等长；<= 0 表示该钱包本轮没有交易，不授权 */
+    amounts: bigint[];
+    /** 与 wallets 等长；RPC 失败时传 MaxUint256 可跳过授权 */
+    allowances: bigint[];
+    txType: number;
+    gasPrice: bigint;
+    chainId: number;
+}
+/** 返回按钱包顺序排好的 approve 原始交易（未授权的钱包不产生交易） */
+export declare function signMissingAllowanceApprovals(params: SignMissingAllowanceApprovalsParams): Promise<string[]>;

package/dist/domains/dex/direct-router-approvals.js

@@ -0,0 +1,45 @@
+/**
+ * V2/V3 直连 Router 卖出/买入前的自动授权。
+ *
+ * 与 V2 路径保持一致：钱包对 Router 的 allowance 不足时，在该钱包的起始 nonce 上
+ * 插入一笔 `approve(spender, MaxUint256)`，并按顺序把后续交易 nonce 顺延。
+ *
+ * 背景：BlockRazor 的 bundle 要求包内交易都不能回滚。漏掉授权时，卖出的
+ * `TransferHelper.safeTransferFrom` 会直接 STF 回滚，整包被拒（表现为
+ * `non-reverting tx in bundle failed`），而且不会指出是哪一笔。
+ */
+import { MaxUint256, ethers } from 'ethers';
+import { estimateApproveGasLimit } from '../../core/gas/bundle-gas.js';
+import { ERC20_ABI } from '../../abis/common.js';
+import { buildGasFields } from '../../core/gas/bundle-gas.js';
+/** 返回按钱包顺序排好的 approve 原始交易（未授权的钱包不产生交易） */
+export async function signMissingAllowanceApprovals(params) {
+    const { provider, wallets, nonces, tokenAddress, spender, amounts, allowances, txType, gasPrice, chainId } = params;
+    if (!ethers.isAddress(tokenAddress) || !ethers.isAddress(spender))
+        return [];
+    const tokenIface = new ethers.Interface(ERC20_ABI);
+    const approveData = tokenIface.encodeFunctionData('approve', [spender, MaxUint256]);
+    const txs = [];
+    for (let i = 0; i < wallets.length; i++) {
+        const amount = amounts[i] ?? 0n;
+        if (amount <= 0n)
+            continue;
+        const allowance = allowances[i];
+        if (allowance === undefined || allowance >= amount)
+            continue;
+        const wallet = wallets[i];
+        const gasLimit = await estimateApproveGasLimit(provider, wallet.address, tokenAddress, approveData);
+        const tx = await wallet.signTransaction({
+            to: tokenAddress,
+            data: approveData,
+            value: 0n,
+            nonce: nonces[i],
+            gasLimit,
+            ...buildGasFields(txType, gasPrice),
+            chainId,
+        });
+        txs.push(tx);
+        nonces[i] += 1;
+    }
+    return txs;
+}

package/dist/domains/dex/direct-router-helpers.d.ts

@@ -15,3 +15,4 @@ export * from './quote.js';
 export * from './profit.js';
 export * from './router.js';
 export * from './dyo-encode.js';
+export * from './direct-router-approvals.js';

package/dist/domains/dex/direct-router-helpers.js

@@ -15,3 +15,4 @@ export * from './quote.js';
 export * from './profit.js';
 export * from './router.js';
 export * from './dyo-encode.js';
+export * from './direct-router-approvals.js';

package/dist/domains/dex/direct-router-v3.js

@@ -7,6 +7,8 @@ import { NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFie
 import { getProfitRecipient, CHAINS, GAS_LIMITS } from '../../core/constants/index.js';
 import { getErrorMessageFromUnknown } from '../../core/index.js';
 import { batchGetBalances } from '../../bundle/internal.js';
+import { batchCheckAllowances } from '../../core/erc20/allowances.js';
+import { signMissingAllowanceApprovals } from './direct-router-approvals.js';
 import { getTokenToNativeQuote } from '../../core/quote/quote-helpers.js';
 import { CHAIN_IDS, V3_ROUTER02_ABI, V3_ROUTER_LEGACY_ABI, buildBribeTransaction, buildProfitTransactionWithHops, calculateProfitAmount, findMaxFlowIndex, getBribeAmount, getCachedProvider, getDeadline, getGasPrice, getWrappedNative, isLegacySwapRouter, isNativeToken, quoteXLayerV3TokenToNativeBySlot0, } from './direct-router-helpers.js';
 // ============================================================================
@@ -37,7 +39,8 @@ export async function directV3BatchBuy(params) {
     const totalFlowWei = flowAmounts.reduce((sum, amt) => sum + amt, 0n);
     const baseProfitWei = calculateProfitAmount(totalFlowWei);
     // ✅ 方案 B：并行获取 nonces、gasPrice 和 ERC20 报价
-    const [nonces, gasPrice, nativeProfitWei] = await Promise.all([
+    const quoteToApprove = useNative ? '' : String(quoteToken || '');
+    const [nonces, gasPrice, nativeProfitWei, allowances] = await Promise.all([
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
@@ -48,6 +51,10 @@ export async function directV3BatchBuy(params) {
                 ? quoteXLayerV3TokenToNativeBySlot0({ provider, tokenIn: quoteToken, amountIn: baseProfitWei, fee })
                 : getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain, 'v3', fee)
             : Promise.resolve(baseProfitWei),
+        // ERC-20 计价币买入要先把计价币授权给 Router，ERC-20 结算不会自动带 approve
+        quoteToApprove && ethers.isAddress(quoteToApprove) && ethers.isAddress(String(routerAddress || ''))
+            ? batchCheckAllowances(provider, quoteToApprove, wallets.map((w) => w.address), routerAddress).catch(() => wallets.map(() => ethers.MaxUint256))
+            : Promise.resolve(wallets.map(() => ethers.MaxUint256)),
     ]);
     let profitWei = nativeProfitWei > 0n ? nativeProfitWei : 0n;
     if (profitWei > 0n && chain.toUpperCase() === 'ENI') {
@@ -55,6 +62,21 @@ export async function directV3BatchBuy(params) {
     }
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;
+    // 计价币 allowance 不足时同包补 approve；nonces[i] 会被顺延
+    const approveTxs = quoteToApprove
+        ? await signMissingAllowanceApprovals({
+            provider,
+            wallets,
+            nonces,
+            tokenAddress: quoteToApprove,
+            spender: String(routerAddress || ''),
+            amounts: flowAmounts,
+            allowances,
+            txType,
+            gasPrice,
+            chainId,
+        })
+        : [];
     const routerIface = new ethers.Interface(routerAbi);
     const inputToken = useNative ? wrappedNative : quoteToken;
     const deadline = getDeadline();
@@ -184,7 +206,7 @@ export async function directV3BatchBuy(params) {
             profitHopWallets = profitResult.hopWallets;
         }
     }
-    const signedTxs = [...bribeTxs, ...swapTxs, ...profitTxs];
+    const signedTxs = [...approveTxs, ...bribeTxs, ...swapTxs, ...profitTxs];
     return {
         signedTransactions: signedTxs,
         profitHopWallets,
@@ -214,12 +236,16 @@ export async function directV3BatchSell(params) {
     const routerAbi = useLegacyRouter ? V3_ROUTER_LEGACY_ABI : V3_ROUTER02_ABI;
     const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
     // ✅ 并行获取所有 RPC 数据
-    const [balances, nonces, gasPrice] = await Promise.all([
+    const [balances, nonces, gasPrice, allowances] = await Promise.all([
         batchGetBalances(provider, wallets.map((w) => w.address), tokenAddress, chainId),
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
         getGasPrice(provider, config),
+        // 卖出要先把代币授权给 Router，否则 TransferHelper 直接 STF 回滚、整包被拒
+        ethers.isAddress(String(tokenAddress || '')) && ethers.isAddress(String(routerAddress || ''))
+            ? batchCheckAllowances(provider, tokenAddress, wallets.map((w) => w.address), routerAddress).catch(() => wallets.map(() => ethers.MaxUint256))
+            : Promise.resolve(wallets.map(() => ethers.MaxUint256)),
     ]);
     const gasLimit = getGasLimit(config, 350000);
     const txType = config.txType ?? 0;
@@ -238,6 +264,19 @@ export async function directV3BatchSell(params) {
         }
     }
     const totalSellAmount = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
+    // 代币 allowance 不足时同包补 approve；nonces[i] 会被顺延
+    const approveTxs = await signMissingAllowanceApprovals({
+        provider,
+        wallets,
+        nonces,
+        tokenAddress: String(tokenAddress || ''),
+        spender: String(routerAddress || ''),
+        amounts: sellAmountsWei,
+        allowances,
+        txType,
+        gasPrice,
+        chainId,
+    });
     // ✅ 修复：对于卖出操作，利润应基于【得到的 BNB/原生代币】而不是【卖出的代币数量】
     // 使用 V2 Router 获取卖出报价，然后基于预估得到的原生代币数量计算利润
     const nativeProfitPromise = (async () => {
@@ -417,7 +456,7 @@ export async function directV3BatchSell(params) {
         .filter((r) => r.type === 'swap')
         .sort((a, b) => a.index - b.index)
         .map((r) => r.tx);
-    const signedTxs = [...bribeTxs, ...swapTxs, ...profitTxs];
+    const signedTxs = [...approveTxs, ...bribeTxs, ...swapTxs, ...profitTxs];
     return {
         signedTransactions: signedTxs,
         profitHopWallets,

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;
+    const mult = multiplier ?? 1.2; // 默认 20% 安全余量（捆绑后面的交易状态会变）
     return BigInt(Math.ceil(Number(estimated) * mult));
 }
 /**

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;
+    const mult = multiplier ?? 1.2; // 默认 20% 安全余量（捆绑后面的交易状态会变）
     return BigInt(Math.ceil(Number(estimated) * mult));
 }
 /**

package/package.json

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