four-flap-meme-sdk 1.6.96 → 1.6.97

package/dist/flap/portal-bundle-merkle/index.d.ts

@@ -11,3 +11,4 @@ export { pancakeProxyBatchBuyMerkle, pancakeProxyBatchSellMerkle, approvePancake
 export { flapDisperseWithBundleMerkle, flapSweepWithBundleMerkle, type FlapDisperseSignParams, type FlapDisperseMerkleResult, type FlapSweepSignParams, type FlapSweepMerkleResult } from './utils.js';
 export { flapBundleCurveToDex, type CurveToDexChain, type DexPoolType, type CurveToDexSignConfig, type CurveBuyerConfig, type DexBuyerConfig, type FlapCurveToDexParams, type FlapCurveToDexResult } from './curve-to-dex.js';
 export { flapBundleCreateToDex, type CreateToDexChain, type CreateToDexSignConfig, type CreateTokenInfo, type FlapCreateToDexParams, type FlapCreateToDexResult, type CurveBuyerConfig as CreateCurveBuyerConfig, type DexBuyerConfig as CreateDexBuyerConfig, type DexPoolType as CreateDexPoolType } from './create-to-dex.js';
+export { flapBundleSwapMerkle, flapBatchSwapMerkle, flapQuickBatchSwapMerkle, flapCrossSwapMerkle, type FlapSwapSignConfig, type FlapSwapConfig, type FlapBundleSwapSignParams, type FlapBundleSwapParams, type FlapSwapResult, type FlapBatchSwapSignParams, type FlapBatchSwapResult, type FlapQuickBatchSwapSignParams, type FlapQuickBatchSwapResult, type FlapCrossSwapParams, type FlapCrossSwapResult, type UserType } from './swap.js';

package/dist/flap/portal-bundle-merkle/index.js

@@ -19,3 +19,5 @@ export { flapDisperseWithBundleMerkle, flapSweepWithBundleMerkle } from './utils
 export { flapBundleCurveToDex } from './curve-to-dex.js';
 // ✅ 发币 + 一键买到外盘（Create → Curve → DEX）- 新代币
 export { flapBundleCreateToDex } from './create-to-dex.js';
+// ✅ 内盘换手方法（一卖一买、一卖多买、快捷资金利用率、交叉换手）
+export { flapBundleSwapMerkle, flapBatchSwapMerkle, flapQuickBatchSwapMerkle, flapCrossSwapMerkle } from './swap.js';

package/dist/flap/portal-bundle-merkle/swap.d.ts

@@ -144,6 +144,38 @@ export interface FlapQuickBatchSwapResult {
         disperseHopCount?: number;
     };
 }
+/** 交叉换手参数 */
+export interface FlapCrossSwapParams {
+    chain: FlapChain;
+    /** 卖方私钥列表（按顺序轮流卖出） */
+    sellerPrivateKeys: string[];
+    /** 每个卖方的卖出数量（与 sellerPrivateKeys 长度一致） */
+    sellAmounts: string[];
+    /** 买方私钥列表（按顺序轮流分配，每笔平分） */
+    buyerPrivateKeys: string[];
+    tokenAddress: string;
+    config: FlapSwapSignConfig;
+    quoteToken?: string;
+    quoteTokenDecimals?: number;
+    /** 每次卖出分配给多少个买方（默认使用全部买方平分） */
+    buyersPerSell?: number;
+    /** 转账多跳数（可选） */
+    disperseHopCount?: number;
+}
+/** 交叉换手结果 */
+export interface FlapCrossSwapResult {
+    signedTransactions: string[];
+    /** 每轮的元数据列表 */
+    rounds: Array<{
+        sellerAddress: string;
+        buyerAddresses: string[];
+        sellAmount: string;
+        bundleHash?: string;
+    }>;
+    /** 汇总的中间钱包信息（转账/利润） */
+    disperseHopWallets?: GeneratedWallet[];
+    profitHopWallets?: GeneratedWallet[];
+}
 /**
  * Flap 内盘快捷批量换手（资金利用率模式）
  *
@@ -159,3 +191,11 @@ export interface FlapQuickBatchSwapResult {
  * 限制：根据多跳数动态计算最大买方数量
  */
 export declare function flapQuickBatchSwapMerkle(params: FlapQuickBatchSwapSignParams): Promise<FlapQuickBatchSwapResult>;
+/**
+ * Flap 交叉换手（多卖多买，循环执行）
+ * - 每个卖方单独卖出，买入金额由卖出所得等分分配给当轮买方
+ * - 利润刮取、转账多跳逻辑继承 flapQuickBatchSwapMerkle
+ * - 结果按顺序拼接 signedTransactions（可交由前端/后端顺序广播）
+ * - ✅ 正确处理 nonce：同一钱包在多轮中使用时 nonce 自动递增
+ */
+export declare function flapCrossSwapMerkle(params: FlapCrossSwapParams): Promise<FlapCrossSwapResult>;

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

@@ -1222,3 +1222,136 @@ export async function flapQuickBatchSwapMerkle(params) {
         }
     };
 }
+/**
+ * Flap 交叉换手（多卖多买，循环执行）
+ * - 每个卖方单独卖出，买入金额由卖出所得等分分配给当轮买方
+ * - 利润刮取、转账多跳逻辑继承 flapQuickBatchSwapMerkle
+ * - 结果按顺序拼接 signedTransactions（可交由前端/后端顺序广播）
+ * - ✅ 正确处理 nonce：同一钱包在多轮中使用时 nonce 自动递增
+ */
+export async function flapCrossSwapMerkle(params) {
+    const { chain, sellerPrivateKeys, sellAmounts, buyerPrivateKeys, tokenAddress, config, quoteToken, quoteTokenDecimals = 18, buyersPerSell, disperseHopCount = 0 } = params;
+    if (sellerPrivateKeys.length === 0) {
+        throw new Error('至少需要一个卖方');
+    }
+    if (sellerPrivateKeys.length !== sellAmounts.length) {
+        throw new Error(`sellAmounts 长度 (${sellAmounts.length}) 必须与卖方数量 (${sellerPrivateKeys.length}) 一致`);
+    }
+    if (buyerPrivateKeys.length === 0) {
+        throw new Error('至少需要一个买方');
+    }
+    // ✅ 创建 Provider 和 NonceManager
+    const chainContext = createChainContext(chain, config);
+    const nonceManager = new NonceManager(chainContext.provider);
+    // ✅ 预先获取所有钱包的初始 nonce
+    const allSellerWallets = sellerPrivateKeys.map(pk => new Wallet(pk, chainContext.provider));
+    const allBuyerWallets = buyerPrivateKeys.map(pk => new Wallet(pk, chainContext.provider));
+    // 使用 Map 去重（同一私钥可能出现多次）
+    const addressToNonce = new Map();
+    // 获取所有卖方 nonce
+    for (const wallet of allSellerWallets) {
+        if (!addressToNonce.has(wallet.address)) {
+            const nonce = await nonceManager.getNextNonce(wallet);
+            addressToNonce.set(wallet.address, nonce);
+        }
+    }
+    // 获取所有买方 nonce
+    for (const wallet of allBuyerWallets) {
+        if (!addressToNonce.has(wallet.address)) {
+            const nonce = await nonceManager.getNextNonce(wallet);
+            addressToNonce.set(wallet.address, nonce);
+        }
+    }
+    console.log(`[flapCrossSwapMerkle] 初始化完成: ${sellerPrivateKeys.length} 卖方, ${buyerPrivateKeys.length} 买方`);
+    const allSigned = [];
+    const allDisperse = [];
+    const allProfit = [];
+    const rounds = [];
+    // 轮流分配买方：每轮取 buyersPerSell 个（默认所有买方），不足则从头继续
+    let buyerCursor = 0;
+    const buyerBatchSize = Math.max(1, buyersPerSell ?? buyerPrivateKeys.length);
+    for (let i = 0; i < sellerPrivateKeys.length; i++) {
+        const sellerPk = sellerPrivateKeys[i];
+        const sellAmount = sellAmounts[i];
+        const sellerWallet = allSellerWallets[i];
+        // 选取本轮买方私钥和钱包
+        const roundBuyerPks = [];
+        const roundBuyerWallets = [];
+        for (let k = 0; k < buyerBatchSize; k++) {
+            const idx = buyerCursor % buyerPrivateKeys.length;
+            roundBuyerPks.push(buyerPrivateKeys[idx]);
+            roundBuyerWallets.push(allBuyerWallets[idx]);
+            buyerCursor++;
+        }
+        // ✅ 获取卖方当前 nonce
+        const sellerNonce = addressToNonce.get(sellerWallet.address);
+        // ✅ 获取并更新买方 nonces（每个买方本轮需要 1 个 nonce）
+        const roundBuyerNonces = roundBuyerWallets.map(w => {
+            const nonce = addressToNonce.get(w.address);
+            addressToNonce.set(w.address, nonce + 1); // 每个买方用 1 个 nonce
+            return nonce;
+        });
+        // 平分买入金额（使用比例模式，避免固定金额超出可分配金额）
+        const ratio = 1 / roundBuyerPks.length;
+        const buyerRatios = roundBuyerPks.map(() => ratio);
+        // ✅ 构建 startNonces: [sellerNonce, buyer1Nonce, buyer2Nonce, ...]
+        const startNonces = [sellerNonce, ...roundBuyerNonces];
+        // ✅ 预先计算卖方 nonce 消耗（精确计算）
+        // 卖方 nonce 消耗 = 贿赂(0/1) + 卖出(1) + 转账(N 或 N*2) + 利润(1)
+        const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
+        const hasBribe = getBribeAmount(config) > 0n;
+        const hasProfit = true; // 默认有利润刮取
+        let sellerNonceConsumed = 0;
+        if (hasBribe)
+            sellerNonceConsumed += 1; // 贿赂
+        sellerNonceConsumed += 1; // 卖出
+        if (disperseHopCount === 0) {
+            sellerNonceConsumed += roundBuyerPks.length; // 直接转账
+        }
+        else if (useNativeToken) {
+            sellerNonceConsumed += roundBuyerPks.length; // 原生多跳：seller→hop1
+        }
+        else {
+            sellerNonceConsumed += roundBuyerPks.length * 2; // ERC20 多跳：BNB + ERC20 两批
+        }
+        if (hasProfit)
+            sellerNonceConsumed += 1; // 利润
+        // 调用单卖多买的签名函数
+        const res = await flapQuickBatchSwapMerkle({
+            chain,
+            sellerPrivateKey: sellerPk,
+            sellAmount,
+            buyerPrivateKeys: roundBuyerPks,
+            buyerRatios,
+            tokenAddress,
+            config,
+            quoteToken,
+            quoteTokenDecimals,
+            disperseHopCount,
+            startNonces // ✅ 传入预计算的 nonces
+        });
+        // ✅ 更新卖方 nonce（使用精确计算的值）
+        addressToNonce.set(sellerWallet.address, sellerNonce + sellerNonceConsumed);
+        console.log(`[flapCrossSwapMerkle] 轮次 ${i + 1}: 卖方=${sellerWallet.address.slice(0, 10)}..., 买方=${roundBuyerPks.length}, 交易=${res.signedTransactions.length}`);
+        // 累积签名与中间钱包
+        allSigned.push(...res.signedTransactions);
+        if (res.disperseHopWallets)
+            allDisperse.push(...res.disperseHopWallets);
+        if (res.profitHopWallets)
+            allProfit.push(...res.profitHopWallets);
+        rounds.push({
+            sellerAddress: res.metadata?.sellerAddress || '',
+            buyerAddresses: res.metadata?.buyerAddresses || roundBuyerPks.map(() => ''),
+            sellAmount,
+            bundleHash: undefined
+        });
+    }
+    nonceManager.clearTemp();
+    console.log(`[flapCrossSwapMerkle] 完成: ${rounds.length} 轮, ${allSigned.length} 笔交易`);
+    return {
+        signedTransactions: allSigned,
+        rounds,
+        disperseHopWallets: allDisperse.length > 0 ? allDisperse : undefined,
+        profitHopWallets: allProfit.length > 0 ? allProfit : undefined
+    };
+}

package/package.json

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