four-flap-meme-sdk 1.7.69 → 1.7.71

package/dist/dex/direct-router.js

@@ -853,7 +853,10 @@ export async function directV3BatchBuy(params) {
                 const refundData = routerIface.encodeFunctionData('refundETH', []);
                 return { txData: routerIface.encodeFunctionData('multicall(uint256,bytes[])', [deadline, [swapData, refundData]]), txValue: amountWei };
             }
-            return { txData: routerIface.encodeFunctionData('exactInputSingle', [swapParams]), txValue: 0n };
+            // ✅ 修复：ERC20 买入也需要使用 multicall 包装以传递 deadline
+            // SwapRouter02 的 exactInputSingle 不包含 deadline 参数，必须通过 multicall 传递
+            const swapData = routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+            return { txData: routerIface.encodeFunctionData('multicall(uint256,bytes[])', [deadline, [swapData]]), txValue: 0n };
         }
     };
     const maxFlowIndex = findMaxFlowIndex(flowAmounts);
@@ -981,14 +984,16 @@ export async function directV3BatchSell(params) {
             if (useNativeOutput) {
                 return routerIface.encodeFunctionData('multicall(bytes[])', [[routerIface.encodeFunctionData('exactInputSingle', [swapParams]), routerIface.encodeFunctionData('unwrapWETH9', [0n, wallet.address])]]);
             }
-            return routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+            // ✅ 修复：ERC20 输出也需要使用 multicall 包装以传递 deadline
+            return routerIface.encodeFunctionData('multicall(bytes[])', [[routerIface.encodeFunctionData('exactInputSingle', [swapParams])]]);
         }
         else {
             const swapParams = { tokenIn: tokenAddress, tokenOut: outputToken, fee, recipient: useNativeOutput ? routerAddress : wallet.address, amountIn: sellAmount, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n };
             if (useNativeOutput) {
                 return routerIface.encodeFunctionData('multicall(uint256,bytes[])', [deadline, [routerIface.encodeFunctionData('exactInputSingle', [swapParams]), routerIface.encodeFunctionData('unwrapWETH9', [0n, wallet.address])]]);
             }
-            return routerIface.encodeFunctionData('exactInputSingle', [swapParams]);
+            // ✅ 修复：ERC20 输出也需要使用 multicall 包装以传递 deadline
+            return routerIface.encodeFunctionData('multicall(uint256,bytes[])', [deadline, [routerIface.encodeFunctionData('exactInputSingle', [swapParams])]]);
         }
     };
     const maxOutputIndex = findMaxFlowIndex(sellAmountsWei);

package/dist/eip7702/xlayer/bundle-approve.d.ts

@@ -15,6 +15,41 @@ import type { BundleApproveParams, BundleApproveResult, EIP7702Config } from './
  * @returns 签名后的交易和元数据
  */
 export declare function bundleApprove(params: BundleApproveParams): Promise<BundleApproveResult>;
+export interface BundleApproveMultiSpendersParams {
+    /** 主钱包（发起交易，支付 gas） */
+    mainPrivateKey: string;
+    /** 需要授权的钱包私钥列表 */
+    privateKeys: string[];
+    /** 代币地址 */
+    tokenAddress: string;
+    /** 授权给的地址列表（多个 spender） */
+    spenderAddresses: string[];
+    /** 授权金额（可选，默认 MaxUint256） */
+    amount?: bigint;
+    /** 配置 */
+    config?: EIP7702Config;
+}
+export interface BundleApproveMultiSpendersResult {
+    /** 签名后的交易 */
+    signedTransaction: string;
+    /** 元数据 */
+    metadata: {
+        walletCount: number;
+        tokenAddress: string;
+        spenderAddresses: string[];
+        totalApproveCalls: number;
+    };
+}
+/**
+ * 多 spender 批量授权 - 生成签名后的交易
+ *
+ * ✅ 将所有钱包对所有 spender 的授权合并到一笔交易中
+ * 避免多笔交易导致的 nonce 冲突问题
+ *
+ * @param params 授权参数
+ * @returns 签名后的交易和元数据
+ */
+export declare function bundleApproveMultiSpenders(params: BundleApproveMultiSpendersParams): Promise<BundleApproveMultiSpendersResult>;
 /**
  * 检查授权状态
  *

package/dist/eip7702/xlayer/bundle-approve.js

@@ -68,6 +68,70 @@ export async function bundleApprove(params) {
         },
     };
 }
+/**
+ * 构建多 spender 批量授权调用
+ * 每个钱包对每个 spender 生成一个 approve 调用
+ */
+function buildApproveCallsMultiSpenders(wallets, tokenAddress, spenderAddresses, amount) {
+    const delegateInterface = new ethers.Interface(EXTENDED_DELEGATE_ABI);
+    const calls = [];
+    // 对每个钱包，授权所有 spender
+    for (const wallet of wallets) {
+        for (const spender of spenderAddresses) {
+            const callData = delegateInterface.encodeFunctionData('executeApprove', [
+                tokenAddress,
+                spender,
+                amount,
+            ]);
+            calls.push({
+                target: wallet.address,
+                allowFailure: false,
+                value: 0n,
+                callData,
+            });
+        }
+    }
+    return calls;
+}
+/**
+ * 多 spender 批量授权 - 生成签名后的交易
+ *
+ * ✅ 将所有钱包对所有 spender 的授权合并到一笔交易中
+ * 避免多笔交易导致的 nonce 冲突问题
+ *
+ * @param params 授权参数
+ * @returns 签名后的交易和元数据
+ */
+export async function bundleApproveMultiSpenders(params) {
+    const { mainPrivateKey, privateKeys, tokenAddress, spenderAddresses, amount = ethers.MaxUint256, config, } = params;
+    if (privateKeys.length === 0) {
+        throw new Error('privateKeys 不能为空');
+    }
+    if (spenderAddresses.length === 0) {
+        throw new Error('spenderAddresses 不能为空');
+    }
+    const provider = getCachedProvider(config?.rpcUrl);
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
+    const mainWallet = createWallet(mainPrivateKey, provider);
+    const wallets = privateKeys.map(pk => createWallet(pk, provider));
+    // 检查 mainWallet 是否在 wallets 中
+    const mainWalletIndex = wallets.findIndex(w => w.address.toLowerCase() === mainWallet.address.toLowerCase());
+    // 只为需要执行授权操作的钱包生成 authorization
+    const authorizations = await signAuthorizationsBatch(wallets, delegateAddress, provider, mainWalletIndex);
+    // ✅ 关键：一次性构建所有 approve 调用
+    const calls = buildApproveCallsMultiSpenders(wallets, tokenAddress, spenderAddresses, amount);
+    console.log(`[bundleApproveMultiSpenders] 钱包数: ${wallets.length}, spender数: ${spenderAddresses.length}, 总调用数: ${calls.length}`);
+    const signedTransaction = await buildEIP7702Transaction(mainWallet, authorizations, calls, 0n, config);
+    return {
+        signedTransaction,
+        metadata: {
+            walletCount: wallets.length,
+            tokenAddress,
+            spenderAddresses,
+            totalApproveCalls: calls.length,
+        },
+    };
+}
 /**
  * 检查授权状态
  *

package/dist/eip7702/xlayer/index.d.ts

@@ -20,7 +20,7 @@ export { bundleBuy, } from './bundle-buy.js';
 export { bundleSell, } from './bundle-sell.js';
 export { bundleSwap, bundleBatchSwap, bundleMultiSwap, type BundleMultiSwapParams, type BundleMultiSwapResult, } from './bundle-swap.js';
 export { disperse, sweep, pairwiseTransfer, disperseWithHops, sweepWithHops, type DisperseParams, type SweepParams, type PairwiseTransferParams, type PairwiseTransferResult, type TransferResult, } from './multi-hop-transfer.js';
-export { bundleApprove, checkApprovalStatus, } from './bundle-approve.js';
+export { bundleApprove, bundleApproveMultiSpenders, checkApprovalStatus, type BundleApproveMultiSpendersParams, type BundleApproveMultiSpendersResult, } from './bundle-approve.js';
 export { bundleCreateBuy, bundleCreateToDex, bundleGraduateBuy, } from './bundle-create.js';
 export type { TokenInfo, CreateTokenParams, AmountMode, BundleCreateBuyParams, BundleCreateBuyResult, BundleCreateToDexParams, BundleCreateToDexResult, BundleGraduateBuyParams, BundleGraduateBuyResult, } from './types.js';
 export { washVolume, bundleVolume, singleRoundVolume, makeVolume, makeVolumeWithSwap, type VolumeMode, type PoolType, type VolumeProgress, type WashVolumeParams, type WashVolumeResult, type BundleVolumeParams, type BundleVolumeResult, type SingleRoundVolumeResult, type MakeVolumeParams, type MakeVolumeSignResult, type SwapVolumeSignResult, } from './volume.js';

package/dist/eip7702/xlayer/index.js

@@ -52,7 +52,7 @@ disperseWithHops, sweepWithHops, } from './multi-hop-transfer.js';
 // ============================================================================
 // 批量授权
 // ============================================================================
-export { bundleApprove, checkApprovalStatus, } from './bundle-approve.js';
+export { bundleApprove, bundleApproveMultiSpenders, checkApprovalStatus, } from './bundle-approve.js';
 // ============================================================================
 // 代币创建与发射
 // ============================================================================

package/dist/index.d.ts

@@ -59,4 +59,4 @@ type XLayerEoaSwapConfig, type XLayerQuickBatchSwapParams, type XLayerQuickBatch
 type XLayerPureCrossSwapResult, // ✅ 真正的交叉换手结果
 type BuyFirstParams as XLayerBuyFirstParams, type BuyFirstResult as XLayerBuyFirstResult, type BuyFirstVolumeParams as XLayerBuyFirstVolumeParams, type BuyFirstVolumeResult as XLayerBuyFirstVolumeResult, type HandleOpsResult as XLayerHandleOpsResult, type AAAccount as XLayerAAAccount, type UserOperation as XLayerUserOperation, type GeneratedAAWallet as XLayerGeneratedAAWallet, type GenerateAAWalletsParams as XLayerGenerateAAWalletsParams, type GenerateAAWalletsResult as XLayerGenerateAAWalletsResult, } from './xlayer/index.js';
 export * as XLayerEIP7702 from './eip7702/xlayer/index.js';
-export { bundleBuy as xlayerEip7702BundleBuy, bundleSell as xlayerEip7702BundleSell, bundleApprove as xlayerEip7702BundleApprove, bundleSwap as xlayerEip7702BundleSwap, bundleBatchSwap as xlayerEip7702BundleBatchSwap, bundleMultiSwap as xlayerEip7702BundleMultiSwap, disperse as xlayerEip7702Disperse, sweep as xlayerEip7702Sweep, pairwiseTransfer as xlayerEip7702PairwiseTransfer, disperseWithHops as xlayerEip7702DisperseWithHops, sweepWithHops as xlayerEip7702SweepWithHops, washVolume as xlayerEip7702WashVolume, bundleVolume as xlayerEip7702BundleVolume, singleRoundVolume as xlayerEip7702SingleRoundVolume, makeVolume as xlayerEip7702MakeVolume, makeVolumeWithSwap as xlayerEip7702MakeVolumeWithSwap, checkApprovalStatus as xlayerEip7702CheckApprovalStatus, getProfitRecipient as xlayerEip7702GetProfitRecipient, calculateProfitAmount as xlayerEip7702CalculateProfitAmount, calculateProfitAmountByUserType as xlayerEip7702CalculateProfitAmountByUserType, calculateProfitAmountByTxCount as xlayerEip7702CalculateProfitAmountByTxCount, getProfitRateBps as xlayerEip7702GetProfitRateBps, getProfitRateBpsDouble as xlayerEip7702GetProfitRateBpsDouble, buildEIP7702Transaction as xlayerEip7702BuildTransaction, signAuthorization as xlayerEip7702SignAuthorization, signAuthorizationsBatch as xlayerEip7702SignAuthorizationsBatch, UNIFIED_DELEGATE_ADDRESS as XLAYER_EIP7702_DELEGATE_ADDRESS, MULTICALL3_ADDRESS as XLAYER_EIP7702_MULTICALL3, PROFIT_CONFIG as XLAYER_EIP7702_PROFIT_CONFIG, WOKB_ADDRESS as XLAYER_EIP7702_WOKB_ADDRESS, POTATOSWAP_V2_ROUTER as XLAYER_EIP7702_V2_ROUTER, POTATOSWAP_V3_ROUTER as XLAYER_EIP7702_V3_ROUTER, DYORSWAP_ROUTER as XLAYER_EIP7702_DYORSWAP_ROUTER, FLAP_PORTAL_ADDRESS as XLAYER_EIP7702_FLAP_PORTAL, type BundleBuyParams as XLayerEip7702BundleBuyParams, type BundleBuyResult as XLayerEip7702BundleBuyResult, type BundleSellParams as XLayerEip7702BundleSellParams, type BundleSellResult as XLayerEip7702BundleSellResult, type BundleApproveParams as XLayerEip7702BundleApproveParams, type BundleApproveResult as XLayerEip7702BundleApproveResult, type BundleSwapParams as XLayerEip7702BundleSwapParams, type BundleSwapResult as XLayerEip7702BundleSwapResult, type BundleMultiSwapParams as XLayerEip7702BundleMultiSwapParams, type BundleMultiSwapResult as XLayerEip7702BundleMultiSwapResult, type UserType as XLayerEip7702UserType, type DisperseParams as XLayerEip7702DisperseParams, type SweepParams as XLayerEip7702SweepParams, type PairwiseTransferParams as XLayerEip7702PairwiseTransferParams, type PairwiseTransferResult as XLayerEip7702PairwiseTransferResult, type TransferResult as XLayerEip7702TransferResult, type WashVolumeParams as XLayerEip7702WashVolumeParams, type WashVolumeResult as XLayerEip7702WashVolumeResult, type BundleVolumeParams as XLayerEip7702BundleVolumeParams, type BundleVolumeResult as XLayerEip7702BundleVolumeResult, type MakeVolumeParams as XLayerEip7702MakeVolumeParams, type MakeVolumeSignResult as XLayerEip7702MakeVolumeResult, type VolumeMode as XLayerEip7702VolumeMode, type PoolType as XLayerEip7702PoolType, type VolumeProgress as XLayerEip7702VolumeProgress, type EIP7702Config as XLayerEip7702Config, type Authorization as XLayerEip7702Authorization, type Call3Value as XLayerEip7702Call, type GeneratedWallet as XLayerEip7702GeneratedWallet, type TradeType as XLayerEip7702TradeType, type RouterType as XLayerEip7702RouterType, bundleCreateBuy as xlayerEip7702BundleCreateBuy, bundleCreateToDex as xlayerEip7702BundleCreateToDex, bundleGraduateBuy as xlayerEip7702BundleGraduateBuy, type TokenInfo as XLayerEip7702TokenInfo, type CreateTokenParams as XLayerEip7702CreateTokenParams, type AmountMode as XLayerEip7702AmountMode, type BundleCreateBuyParams as XLayerEip7702BundleCreateBuyParams, type BundleCreateBuyResult as XLayerEip7702BundleCreateBuyResult, type BundleCreateToDexParams as XLayerEip7702BundleCreateToDexParams, type BundleCreateToDexResult as XLayerEip7702BundleCreateToDexResult, type BundleGraduateBuyParams as XLayerEip7702BundleGraduateBuyParams, type BundleGraduateBuyResult as XLayerEip7702BundleGraduateBuyResult, } from './eip7702/xlayer/index.js';
+export { bundleBuy as xlayerEip7702BundleBuy, bundleSell as xlayerEip7702BundleSell, bundleApprove as xlayerEip7702BundleApprove, bundleApproveMultiSpenders as xlayerEip7702BundleApproveMultiSpenders, bundleSwap as xlayerEip7702BundleSwap, bundleBatchSwap as xlayerEip7702BundleBatchSwap, bundleMultiSwap as xlayerEip7702BundleMultiSwap, disperse as xlayerEip7702Disperse, sweep as xlayerEip7702Sweep, pairwiseTransfer as xlayerEip7702PairwiseTransfer, disperseWithHops as xlayerEip7702DisperseWithHops, sweepWithHops as xlayerEip7702SweepWithHops, washVolume as xlayerEip7702WashVolume, bundleVolume as xlayerEip7702BundleVolume, singleRoundVolume as xlayerEip7702SingleRoundVolume, makeVolume as xlayerEip7702MakeVolume, makeVolumeWithSwap as xlayerEip7702MakeVolumeWithSwap, checkApprovalStatus as xlayerEip7702CheckApprovalStatus, getProfitRecipient as xlayerEip7702GetProfitRecipient, calculateProfitAmount as xlayerEip7702CalculateProfitAmount, calculateProfitAmountByUserType as xlayerEip7702CalculateProfitAmountByUserType, calculateProfitAmountByTxCount as xlayerEip7702CalculateProfitAmountByTxCount, getProfitRateBps as xlayerEip7702GetProfitRateBps, getProfitRateBpsDouble as xlayerEip7702GetProfitRateBpsDouble, buildEIP7702Transaction as xlayerEip7702BuildTransaction, signAuthorization as xlayerEip7702SignAuthorization, signAuthorizationsBatch as xlayerEip7702SignAuthorizationsBatch, UNIFIED_DELEGATE_ADDRESS as XLAYER_EIP7702_DELEGATE_ADDRESS, MULTICALL3_ADDRESS as XLAYER_EIP7702_MULTICALL3, PROFIT_CONFIG as XLAYER_EIP7702_PROFIT_CONFIG, WOKB_ADDRESS as XLAYER_EIP7702_WOKB_ADDRESS, POTATOSWAP_V2_ROUTER as XLAYER_EIP7702_V2_ROUTER, POTATOSWAP_V3_ROUTER as XLAYER_EIP7702_V3_ROUTER, DYORSWAP_ROUTER as XLAYER_EIP7702_DYORSWAP_ROUTER, FLAP_PORTAL_ADDRESS as XLAYER_EIP7702_FLAP_PORTAL, type BundleBuyParams as XLayerEip7702BundleBuyParams, type BundleBuyResult as XLayerEip7702BundleBuyResult, type BundleSellParams as XLayerEip7702BundleSellParams, type BundleSellResult as XLayerEip7702BundleSellResult, type BundleApproveParams as XLayerEip7702BundleApproveParams, type BundleApproveResult as XLayerEip7702BundleApproveResult, type BundleApproveMultiSpendersParams as XLayerEip7702BundleApproveMultiSpendersParams, type BundleApproveMultiSpendersResult as XLayerEip7702BundleApproveMultiSpendersResult, type BundleSwapParams as XLayerEip7702BundleSwapParams, type BundleSwapResult as XLayerEip7702BundleSwapResult, type BundleMultiSwapParams as XLayerEip7702BundleMultiSwapParams, type BundleMultiSwapResult as XLayerEip7702BundleMultiSwapResult, type UserType as XLayerEip7702UserType, type DisperseParams as XLayerEip7702DisperseParams, type SweepParams as XLayerEip7702SweepParams, type PairwiseTransferParams as XLayerEip7702PairwiseTransferParams, type PairwiseTransferResult as XLayerEip7702PairwiseTransferResult, type TransferResult as XLayerEip7702TransferResult, type WashVolumeParams as XLayerEip7702WashVolumeParams, type WashVolumeResult as XLayerEip7702WashVolumeResult, type BundleVolumeParams as XLayerEip7702BundleVolumeParams, type BundleVolumeResult as XLayerEip7702BundleVolumeResult, type MakeVolumeParams as XLayerEip7702MakeVolumeParams, type MakeVolumeSignResult as XLayerEip7702MakeVolumeResult, type VolumeMode as XLayerEip7702VolumeMode, type PoolType as XLayerEip7702PoolType, type VolumeProgress as XLayerEip7702VolumeProgress, type EIP7702Config as XLayerEip7702Config, type Authorization as XLayerEip7702Authorization, type Call3Value as XLayerEip7702Call, type GeneratedWallet as XLayerEip7702GeneratedWallet, type TradeType as XLayerEip7702TradeType, type RouterType as XLayerEip7702RouterType, bundleCreateBuy as xlayerEip7702BundleCreateBuy, bundleCreateToDex as xlayerEip7702BundleCreateToDex, bundleGraduateBuy as xlayerEip7702BundleGraduateBuy, type TokenInfo as XLayerEip7702TokenInfo, type CreateTokenParams as XLayerEip7702CreateTokenParams, type AmountMode as XLayerEip7702AmountMode, type BundleCreateBuyParams as XLayerEip7702BundleCreateBuyParams, type BundleCreateBuyResult as XLayerEip7702BundleCreateBuyResult, type BundleCreateToDexParams as XLayerEip7702BundleCreateToDexParams, type BundleCreateToDexResult as XLayerEip7702BundleCreateToDexResult, type BundleGraduateBuyParams as XLayerEip7702BundleGraduateBuyParams, type BundleGraduateBuyResult as XLayerEip7702BundleGraduateBuyResult, } from './eip7702/xlayer/index.js';

package/dist/index.js

@@ -142,7 +142,7 @@ xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, //
 // ============================================================
 export * as XLayerEIP7702 from './eip7702/xlayer/index.js';
 // EIP-7702 批量操作（注意使用 eip7702 前缀避免与 AA 模式冲突）
-export { bundleBuy as xlayerEip7702BundleBuy, bundleSell as xlayerEip7702BundleSell, bundleApprove as xlayerEip7702BundleApprove, bundleSwap as xlayerEip7702BundleSwap, bundleBatchSwap as xlayerEip7702BundleBatchSwap, bundleMultiSwap as xlayerEip7702BundleMultiSwap, 
+export { bundleBuy as xlayerEip7702BundleBuy, bundleSell as xlayerEip7702BundleSell, bundleApprove as xlayerEip7702BundleApprove, bundleApproveMultiSpenders as xlayerEip7702BundleApproveMultiSpenders, bundleSwap as xlayerEip7702BundleSwap, bundleBatchSwap as xlayerEip7702BundleBatchSwap, bundleMultiSwap as xlayerEip7702BundleMultiSwap, 
 // 转账功能
 disperse as xlayerEip7702Disperse, sweep as xlayerEip7702Sweep, pairwiseTransfer as xlayerEip7702PairwiseTransfer, 
 // 向后兼容

package/package.json

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