four-flap-meme-sdk 1.4.83 → 1.4.84

package/dist/flap/portal-bundle-merkle/create-to-dex.js

@@ -12,6 +12,19 @@ import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_
 import { FLAP_PORTAL_ADDRESSES, FLAP_ORIGINAL_PORTAL_ADDRESSES } from '../constants.js';
 import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
 import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
+// ==================== ERC20 ABI ====================
+const ERC20_ABI = [
+    {
+        type: "function",
+        name: "approve",
+        inputs: [
+            { name: "spender", type: "address" },
+            { name: "amount", type: "uint256" }
+        ],
+        outputs: [{ name: "", type: "bool" }],
+        stateMutability: "nonpayable"
+    }
+];
 // ==================== 链常量 ====================
 const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
 const BSC_PANCAKE_V3_ROUTER = ADDRESSES.BSC.PancakeV3Router;
@@ -57,9 +70,36 @@ const PANCAKE_V3_ROUTER_ABI = [
         ],
         "outputs": [{ "name": "amountOut", "type": "uint256" }],
         "stateMutability": "payable"
-    }
+    },
 ];
+// ==================== V3 费率配置 ====================
+// USD1/USDT 使用 100 bps (0.01%)，其他使用 2500 bps (0.25%)
+const USD1_V3_FEE = 100;
+const DEFAULT_V3_FEE = 2500;
 // ==================== 工具函数 ====================
+/** 构建 ERC20 approve 交易 */
+async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amount, nonce, gasPrice, txType) {
+    const erc20Interface = new ethers.Interface(ERC20_ABI);
+    const data = erc20Interface.encodeFunctionData('approve', [spenderAddress, amount]);
+    const tx = {
+        to: tokenAddress,
+        data,
+        from: wallet.address,
+        nonce,
+        gasLimit: BigInt(100000), // approve 交易 gas 较低
+        chainId: 56,
+        type: txType
+    };
+    if (txType === 2) {
+        const priorityFee = gasPrice / 10n === 0n ? 1n : gasPrice / 10n;
+        tx.maxFeePerGas = gasPrice;
+        tx.maxPriorityFeePerGas = priorityFee;
+    }
+    else {
+        tx.gasPrice = gasPrice;
+    }
+    return wallet.signTransaction(tx);
+}
 function getGasLimit(config, defaultGas = 800000) {
     if (config.gasLimit !== undefined) {
         return typeof config.gasLimit === 'bigint' ? config.gasLimit : BigInt(config.gasLimit);
@@ -232,17 +272,27 @@ export async function flapBundleCreateToDex(params) {
     }
     // 3. 内盘买入交易（包含毕业触发）
     // 最后一个买入交易会触发毕业，需要更多 gas
+    // ✅ ERC20 需要先 approve，再买入
     const curveBuyTxPromises = curveWallets.map(async ({ wallet }, i) => {
         const addr = wallet.address.toLowerCase();
-        const nonce = noncesMap.get(addr);
-        noncesMap.set(addr, nonce + 1);
+        const signedTxs = [];
+        // ✅ ERC20: 先构建 approve 交易
+        if (!useNativeToken) {
+            const approveNonce = noncesMap.get(addr);
+            noncesMap.set(addr, approveNonce + 1);
+            const approveTx = await buildApproveTransaction(wallet, quoteToken, portalAddress, curveBuyAmounts[i], approveNonce, gasPrice, txType);
+            signedTxs.push(approveTx);
+        }
+        // 构建买入交易
+        const buyNonce = noncesMap.get(addr);
+        noncesMap.set(addr, buyNonce + 1);
         const portal = new Contract(portalAddress, PORTAL_ABI, wallet);
         const unsigned = await portal.swapExactInput.populateTransaction({
             inputToken,
             outputToken: tokenAddress,
             inputAmount: curveBuyAmounts[i],
             minOutputAmount: 0n,
-            permitData: '0x'
+            permitData: '0x' // 不使用 permit，使用链上 approve
         }, useNativeToken ? { value: curveBuyAmounts[i] } : {});
         // 最后一个买家触发毕业，需要更多 gas
         const isLastBuyer = i === curveWallets.length - 1;
@@ -250,7 +300,7 @@ export async function flapBundleCreateToDex(params) {
         const tx = {
             ...unsigned,
             from: wallet.address,
-            nonce,
+            nonce: buyNonce,
             gasLimit: buyGasLimit,
             chainId: 56,
             type: txType,
@@ -263,67 +313,63 @@ export async function flapBundleCreateToDex(params) {
         else {
             tx.gasPrice = gasPrice;
         }
-        return wallet.signTransaction(tx);
+        const signedBuy = await wallet.signTransaction(tx);
+        signedTxs.push(signedBuy);
+        return signedTxs;
     });
-    const signedCurveBuys = await Promise.all(curveBuyTxPromises);
-    allTransactions.push(...signedCurveBuys);
+    const curveBuyResults = await Promise.all(curveBuyTxPromises);
+    // 展平数组：每个钱包可能有 [approve, buy] 或只有 [buy]
+    curveBuyResults.forEach(txs => allTransactions.push(...txs));
     // 4. 外盘买入交易（PancakeSwap）
+    // ✅ ERC20 需要先 approve，再 swap
     if (enableDexBuy && dexWallets.length > 0) {
         const dexBuyTxPromises = dexWallets.map(async ({ wallet }, i) => {
             const addr = wallet.address.toLowerCase();
-            const nonce = noncesMap.get(addr);
-            noncesMap.set(addr, nonce + 1);
+            const signedTxs = [];
             const buyAmount = dexBuyAmounts[i];
             const smartRouter = dexPoolType === 'v3' ? BSC_PANCAKE_V3_ROUTER : BSC_PANCAKE_V2_ROUTER;
-            let calldata;
+            // ✅ 根据 quoteToken 选择 V3 费率
+            const actualV3Fee = v3Fee || (useNativeToken ? DEFAULT_V3_FEE : USD1_V3_FEE);
+            // ✅ ERC20: 先构建 approve 交易
+            if (!useNativeToken) {
+                const approveNonce = noncesMap.get(addr);
+                noncesMap.set(addr, approveNonce + 1);
+                const approveTx = await buildApproveTransaction(wallet, quoteToken, smartRouter, buyAmount, approveNonce, gasPrice, txType);
+                signedTxs.push(approveTx);
+            }
+            // 构建买入交易
+            const buyNonce = noncesMap.get(addr);
+            noncesMap.set(addr, buyNonce + 1);
+            let multicallData = [];
             let value;
+            const routerInterface = new ethers.Interface(PANCAKE_V3_ROUTER_ABI);
             if (dexPoolType === 'v3') {
-                if (useNativeToken) {
-                    const params = {
-                        tokenIn: BSC_WBNB,
-                        tokenOut: tokenAddress,
-                        fee: v3Fee,
-                        recipient: wallet.address,
-                        amountIn: buyAmount,
-                        amountOutMinimum: 0n,
-                        sqrtPriceLimitX96: 0n
-                    };
-                    const exactInputSingleData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('exactInputSingle', [params]);
-                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[exactInputSingleData]]);
-                    value = buyAmount;
-                }
-                else {
-                    const params = {
-                        tokenIn: quoteToken,
-                        tokenOut: tokenAddress,
-                        fee: v3Fee,
-                        recipient: wallet.address,
-                        amountIn: buyAmount,
-                        amountOutMinimum: 0n,
-                        sqrtPriceLimitX96: 0n
-                    };
-                    const exactInputSingleData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('exactInputSingle', [params]);
-                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[exactInputSingleData]]);
-                    value = 0n;
-                }
+                // V3: exactInputSingle
+                const params = {
+                    tokenIn: useNativeToken ? BSC_WBNB : quoteToken,
+                    tokenOut: tokenAddress,
+                    fee: actualV3Fee,
+                    recipient: wallet.address,
+                    amountIn: buyAmount,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n
+                };
+                multicallData = [routerInterface.encodeFunctionData('exactInputSingle', [params])];
+                value = useNativeToken ? buyAmount : 0n;
             }
             else {
-                if (useNativeToken) {
-                    const swapData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('swapExactTokensForTokens', [buyAmount, 0n, [BSC_WBNB, tokenAddress], wallet.address]);
-                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[swapData]]);
-                    value = buyAmount;
-                }
-                else {
-                    const swapData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('swapExactTokensForTokens', [buyAmount, 0n, [quoteToken, tokenAddress], wallet.address]);
-                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[swapData]]);
-                    value = 0n;
-                }
+                // V2: swapExactTokensForTokens
+                const path = useNativeToken ? [BSC_WBNB, tokenAddress] : [quoteToken, tokenAddress];
+                const swapData = routerInterface.encodeFunctionData('swapExactTokensForTokens', [buyAmount, 0n, path, wallet.address]);
+                multicallData = [swapData];
+                value = useNativeToken ? buyAmount : 0n;
             }
+            const calldata = routerInterface.encodeFunctionData('multicall', [multicallData]);
             const tx = {
                 to: smartRouter,
                 data: calldata,
                 from: wallet.address,
-                nonce,
+                nonce: buyNonce,
                 gasLimit: BigInt(500000),
                 chainId: 56,
                 type: txType,
@@ -336,10 +382,13 @@ export async function flapBundleCreateToDex(params) {
             else {
                 tx.gasPrice = gasPrice;
             }
-            return wallet.signTransaction(tx);
+            const signedBuy = await wallet.signTransaction(tx);
+            signedTxs.push(signedBuy);
+            return signedTxs;
         });
-        const signedDexBuys = await Promise.all(dexBuyTxPromises);
-        allTransactions.push(...signedDexBuys);
+        const dexBuyResults = await Promise.all(dexBuyTxPromises);
+        // 展平数组：每个钱包可能有 [approve, buy] 或只有 [buy]
+        dexBuyResults.forEach(txs => allTransactions.push(...txs));
     }
     // 5. 利润多跳转账
     let profitHopWallets;

package/package.json

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