four-flap-meme-sdk 1.4.72 → 1.4.73

package/dist/contracts/tm-bundle-merkle/swap-buy-first.js

@@ -139,13 +139,16 @@ export async function fourBundleBuyFirstMerkle(params) {
     if (!estimatedTokenAmount || estimatedTokenAmount <= 0n) {
         throw new Error('报价失败：无法估算可买入的代币数量');
     }
-    // ✅ 多笔买入时添加安全系数：减少 1% 卖出数量以应对报价误差/税/滑点
-    // 原因：多笔买入会产生滑点累积，实际获得的代币可能少于报价
-    // 单笔买入时不需要安全系数（与普通捆绑换手一致）
+    // ✅ 多笔交易时添加安全系数：减少卖出数量以应对报价误差/税/滑点
+    // 原因：多笔买入会产生滑点累积（每笔买入后 AMM 价格上涨），实际获得的代币少于报价
+    // 单笔买入+单笔卖出时不需要安全系数（与普通捆绑换手一致）
     let sellAmountWei = estimatedTokenAmount;
-    if (buyCount > 1) {
-        const SELL_SAFETY_BPS = 100n; // 1% = 100 bps（仅多笔时）
-        sellAmountWei = estimatedTokenAmount * (10000n - SELL_SAFETY_BPS) / 10000n;
+    if (buyCount > 1 || sellCount > 1) {
+        // 根据买入笔数动态调整安全系数：2% + 每多一笔额外 0.5%
+        const baseSafetyBps = 200n; // 2% 基础安全系数
+        const extraSafetyBps = BigInt((buyCount - 1) * 50); // 每多一笔买入额外 0.5%
+        const totalSafetyBps = baseSafetyBps + extraSafetyBps;
+        sellAmountWei = estimatedTokenAmount * (10000n - totalSafetyBps) / 10000n;
     }
     // 卖方余额检查
     if (!sameAddress && sellerTokenBal < sellAmountWei) {

package/dist/pancake/bundle-buy-first.js

@@ -140,13 +140,16 @@ export async function pancakeBundleBuyFirstMerkle(params) {
         buyerFundsWei: buyerFundsInfo.buyerFundsWei,
         provider: context.provider
     });
-    // ✅ 多笔买入时添加安全系数：减少 1% 卖出数量以应对报价误差/税/滑点
-    // 原因：多笔买入会产生滑点累积，实际获得的代币可能少于报价
-    // 单笔买入时不需要安全系数（与普通捆绑换手一致）
+    // ✅ 多笔交易时添加安全系数：减少卖出数量以应对报价误差/税/滑点
+    // 原因：多笔买入会产生滑点累积（每笔买入后 AMM 价格上涨），实际获得的代币少于报价
+    // 单笔买入+单笔卖出时不需要安全系数（与普通捆绑换手一致）
     let adjustedSellAmount = quoteResult.quotedTokenOut;
-    if (buyCount > 1) {
-        const SELL_SAFETY_BPS = 100n; // 1% = 100 bps（仅多笔时）
-        adjustedSellAmount = quoteResult.quotedTokenOut * (10000n - SELL_SAFETY_BPS) / 10000n;
+    if (buyCount > 1 || sellCount > 1) {
+        // 根据买入笔数动态调整安全系数：2% + 每多一笔额外 0.5%
+        const baseSafetyBps = 200n; // 2% 基础安全系数
+        const extraSafetyBps = BigInt((buyCount - 1) * 50); // 每多一笔买入额外 0.5%
+        const totalSafetyBps = baseSafetyBps + extraSafetyBps;
+        adjustedSellAmount = quoteResult.quotedTokenOut * (10000n - totalSafetyBps) / 10000n;
     }
     // ✅ 拆分买入和卖出金额
     const buyAmountsWei = splitAmount(buyerFundsInfo.buyerFundsWei, buyCount);
@@ -409,26 +412,34 @@ function calculateBuyerNeed({ quotedNative, buyerBalance, reserveGas }) {
 }
 async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountToken, buyer, seller, tokenAddress, useNativeToken = true }) {
     const deadline = getDeadline();
-    // ✅ ERC20 购买时，value 只需要 FLAT_FEE
-    const buyValue = useNativeToken ? buyerFundsWei + FLAT_FEE : FLAT_FEE;
     if (routeParams.routeType === 'v2') {
         const { v2Path } = routeParams;
         const reversePath = [...v2Path].reverse();
         // ✅ 使用官方 V2 Router
         const v2RouterBuyer = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, buyer);
         const v2RouterSeller = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, seller);
-        // 买入：BNB → Token
-        const buyUnsigned = await v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, v2Path, buyer.address, deadline, { value: buyValue });
-        // 卖出：Token → BNB
-        const sellUnsigned = await v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline);
-        return { buyUnsigned, sellUnsigned };
+        if (useNativeToken) {
+            // ✅ BNB 池子：使用 swapExactETHForTokens / swapExactTokensForETH
+            const buyValue = buyerFundsWei + FLAT_FEE;
+            const buyUnsigned = await v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, v2Path, buyer.address, deadline, { value: buyValue });
+            const sellUnsigned = await v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline);
+            return { buyUnsigned, sellUnsigned };
+        }
+        else {
+            // ✅ ERC20 池子（如 USDT）：使用 swapExactTokensForTokens
+            const buyUnsigned = await v2RouterBuyer.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(buyerFundsWei, 0n, v2Path, buyer.address, deadline);
+            const sellUnsigned = await v2RouterSeller.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline);
+            return { buyUnsigned, sellUnsigned };
+        }
     }
     if (routeParams.routeType === 'v3-single') {
         const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
         const v3RouterIface = new ethers.Interface(PANCAKE_V3_ROUTER_ABI);
         const v3RouterBuyer = new Contract(PANCAKE_V3_ROUTER_ADDRESS, PANCAKE_V3_ROUTER_ABI, buyer);
         const v3RouterSeller = new Contract(PANCAKE_V3_ROUTER_ADDRESS, PANCAKE_V3_ROUTER_ABI, seller);
-        // 买入：WBNB → Token
+        // ✅ V3 池子的处理
+        const buyValue = useNativeToken ? buyerFundsWei + FLAT_FEE : FLAT_FEE;
+        // 买入交易
         const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
                 tokenIn: v3TokenIn,
                 tokenOut: v3TokenOut,
@@ -439,19 +450,36 @@ async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountTo
                 sqrtPriceLimitX96: 0n
             }]);
         const buyUnsigned = await v3RouterBuyer.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
-        // 卖出：Token → WBNB → BNB
-        const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-                tokenIn: v3TokenOut,
-                tokenOut: v3TokenIn,
-                fee: v3Fee,
-                recipient: PANCAKE_V3_ROUTER_ADDRESS,
-                amountIn: sellAmountToken,
-                amountOutMinimum: 0n,
-                sqrtPriceLimitX96: 0n
-            }]);
-        const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
-        const sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
-        return { buyUnsigned, sellUnsigned };
+        // 卖出交易
+        if (useNativeToken) {
+            // ✅ BNB 池子：卖出后 unwrap WBNB 为 BNB
+            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                    tokenIn: v3TokenOut,
+                    tokenOut: v3TokenIn,
+                    fee: v3Fee,
+                    recipient: PANCAKE_V3_ROUTER_ADDRESS,
+                    amountIn: sellAmountToken,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n
+                }]);
+            const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
+            const sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
+            return { buyUnsigned, sellUnsigned };
+        }
+        else {
+            // ✅ ERC20 池子：卖出后直接获得 ERC20
+            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                    tokenIn: v3TokenOut,
+                    tokenOut: v3TokenIn,
+                    fee: v3Fee,
+                    recipient: seller.address, // 直接发送到卖方地址
+                    amountIn: sellAmountToken,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n
+                }]);
+            const sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData]);
+            return { buyUnsigned, sellUnsigned };
+        }
     }
     // V3 多跳暂不支持官方合约
     throw new Error('V3 多跳路由暂不支持官方合约，请使用 V2 路由或 V3 单跳');
@@ -466,14 +494,22 @@ async function buildMultiRouteTransactions({ routeParams, buyAmountsWei, sellAmo
         const reversePath = [...v2Path].reverse();
         const v2RouterBuyer = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, buyer);
         const v2RouterSeller = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, seller);
-        // 构建多笔买入交易
-        const buyUnsignedArray = await Promise.all(buyAmountsWei.map(amount => {
-            const buyValue = useNativeToken ? amount + FLAT_FEE : FLAT_FEE;
-            return v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, v2Path, buyer.address, deadline, { value: buyValue });
-        }));
-        // 构建多笔卖出交易
-        const sellUnsignedArray = await Promise.all(sellAmountsWei.map(amount => v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(amount, 0n, reversePath, seller.address, deadline)));
-        return { buyUnsignedArray, sellUnsignedArray };
+        // ✅ 根据是否使用原生代币选择不同的函数
+        if (useNativeToken) {
+            // BNB 池子：使用 swapExactETHForTokens / swapExactTokensForETH
+            const buyUnsignedArray = await Promise.all(buyAmountsWei.map(amount => {
+                const buyValue = amount + FLAT_FEE;
+                return v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, v2Path, buyer.address, deadline, { value: buyValue });
+            }));
+            const sellUnsignedArray = await Promise.all(sellAmountsWei.map(amount => v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(amount, 0n, reversePath, seller.address, deadline)));
+            return { buyUnsignedArray, sellUnsignedArray };
+        }
+        else {
+            // ✅ ERC20 池子（如 USDT）：使用 swapExactTokensForTokens
+            const buyUnsignedArray = await Promise.all(buyAmountsWei.map(amount => v2RouterBuyer.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(amount, 0n, v2Path, buyer.address, deadline)));
+            const sellUnsignedArray = await Promise.all(sellAmountsWei.map(amount => v2RouterSeller.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(amount, 0n, reversePath, seller.address, deadline)));
+            return { buyUnsignedArray, sellUnsignedArray };
+        }
     }
     if (routeParams.routeType === 'v3-single') {
         const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
@@ -494,21 +530,40 @@ async function buildMultiRouteTransactions({ routeParams, buyAmountsWei, sellAmo
                 }]);
             return v3RouterBuyer.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
         }));
-        // 构建多笔卖出交易
-        const sellUnsignedArray = await Promise.all(sellAmountsWei.map(amount => {
-            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-                    tokenIn: v3TokenOut,
-                    tokenOut: v3TokenIn,
-                    fee: v3Fee,
-                    recipient: PANCAKE_V3_ROUTER_ADDRESS,
-                    amountIn: amount,
-                    amountOutMinimum: 0n,
-                    sqrtPriceLimitX96: 0n
-                }]);
-            const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
-            return v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
-        }));
-        return { buyUnsignedArray, sellUnsignedArray };
+        // ✅ 根据是否使用原生代币构建不同的卖出交易
+        if (useNativeToken) {
+            // BNB 池子：卖出后 unwrap WBNB 为 BNB
+            const sellUnsignedArray = await Promise.all(sellAmountsWei.map(amount => {
+                const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                        tokenIn: v3TokenOut,
+                        tokenOut: v3TokenIn,
+                        fee: v3Fee,
+                        recipient: PANCAKE_V3_ROUTER_ADDRESS,
+                        amountIn: amount,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n
+                    }]);
+                const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
+                return v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
+            }));
+            return { buyUnsignedArray, sellUnsignedArray };
+        }
+        else {
+            // ✅ ERC20 池子：卖出后直接获得 ERC20
+            const sellUnsignedArray = await Promise.all(sellAmountsWei.map(amount => {
+                const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                        tokenIn: v3TokenOut,
+                        tokenOut: v3TokenIn,
+                        fee: v3Fee,
+                        recipient: seller.address, // 直接发送到卖方地址
+                        amountIn: amount,
+                        amountOutMinimum: 0n,
+                        sqrtPriceLimitX96: 0n
+                    }]);
+                return v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData]);
+            }));
+            return { buyUnsignedArray, sellUnsignedArray };
+        }
     }
     throw new Error('V3 多跳路由暂不支持官方合约，请使用 V2 路由或 V3 单跳');
 }

package/package.json

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