four-flap-meme-sdk 4.5.0 → 4.5.1

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/package.json

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