four-flap-meme-sdk 2.2.1 → 2.2.2

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

@@ -8,67 +8,67 @@
  * 4. 多个钱包在 PancakeSwap（外盘）继续买入
  */
 import { ethers, Contract, Wallet } from 'ethers';
-import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
+import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES, FLAP_ORIGINAL_PORTAL_ADDRESSES } from '../constants.js';
-import { buildVaultParams, VAULT_PORTAL_ADDRESSES, VAULT_PORTAL_ABI } from '../vault.js';
-import { ZERO_ADDRESS } from '../../../shared/constants/index.js';
+import { buildNewTokenV6WithVaultParams, VAULT_PORTAL_ADDRESSES, VAULT_PORTAL_ABI } from '../vault.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS } from '../../../utils/constants.js';
 import { GAS_LIMITS } from '../../constants/index.js';
-import { getGasPriceConfig, getTxType, getProfitRecipient, getProfitRateBps, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI, } from './config.js';
+import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
 // ==================== ERC20 ABI ====================
 const ERC20_ABI = [
     {
-        type: 'function',
-        name: 'approve',
+        type: "function",
+        name: "approve",
         inputs: [
-            { name: 'spender', type: 'address' },
-            { name: 'amount', type: 'uint256' },
+            { name: "spender", type: "address" },
+            { name: "amount", type: "uint256" }
         ],
-        outputs: [{ name: '', type: 'bool' }],
-        stateMutability: 'nonpayable',
-    },
+        outputs: [{ name: "", type: "bool" }],
+        stateMutability: "nonpayable"
+    }
 ];
 // ==================== PancakeSwap Router ABI ====================
 const PANCAKE_ROUTER_ABI = [
     {
-        type: 'function',
-        name: 'exactInputSingle',
+        type: "function",
+        name: "exactInputSingle",
         inputs: [
             {
-                name: 'params',
-                type: 'tuple',
+                name: "params",
+                type: "tuple",
                 components: [
-                    { name: 'tokenIn', type: 'address' },
-                    { name: 'tokenOut', type: 'address' },
-                    { name: 'fee', type: 'uint24' },
-                    { name: 'recipient', type: 'address' },
-                    { name: 'amountIn', type: 'uint256' },
-                    { name: 'amountOutMinimum', type: 'uint256' },
-                    { name: 'sqrtPriceLimitX96', type: 'uint160' },
-                ],
-            },
+                    { name: "tokenIn", type: "address" },
+                    { name: "tokenOut", type: "address" },
+                    { name: "fee", type: "uint24" },
+                    { name: "recipient", type: "address" },
+                    { name: "amountIn", type: "uint256" },
+                    { name: "amountOutMinimum", type: "uint256" },
+                    { name: "sqrtPriceLimitX96", type: "uint160" }
+                ]
+            }
         ],
-        outputs: [{ name: 'amountOut', type: 'uint256' }],
-        stateMutability: 'payable',
+        outputs: [{ name: "amountOut", type: "uint256" }],
+        stateMutability: "payable"
     },
     {
-        type: 'function',
-        name: 'multicall',
-        inputs: [{ name: 'data', type: 'bytes[]' }],
-        outputs: [{ name: 'results', type: 'bytes[]' }],
-        stateMutability: 'payable',
+        type: "function",
+        name: "multicall",
+        inputs: [{ name: "data", type: "bytes[]" }],
+        outputs: [{ name: "results", type: "bytes[]" }],
+        stateMutability: "payable"
     },
     {
-        type: 'function',
-        name: 'swapExactTokensForTokens',
+        type: "function",
+        name: "swapExactTokensForTokens",
         inputs: [
-            { name: 'amountIn', type: 'uint256' },
-            { name: 'amountOutMin', type: 'uint256' },
-            { name: 'path', type: 'address[]' },
-            { name: 'to', type: 'address' },
+            { name: "amountIn", type: "uint256" },
+            { name: "amountOutMin", type: "uint256" },
+            { name: "path", type: "address[]" },
+            { name: "to", type: "address" }
         ],
-        outputs: [{ name: 'amountOut', type: 'uint256' }],
-        stateMutability: 'payable',
-    },
+        outputs: [{ name: "amountOut", type: "uint256" }],
+        stateMutability: "payable"
+    }
 ];
 // ==================== DEX 地址常量 ====================
 const DEX_ADDRESSES = {
@@ -85,7 +85,7 @@ const DEX_ADDRESSES = {
         // ✅ Base 使用 Uniswap V3 SwapRouter02
         UNISWAP_SMART_ROUTER: '0x2626664c2603336E57B271c5C0b26F421741e481',
         WETH: '0x4200000000000000000000000000000000000006',
-    },
+    }
 };
 // ==================== 链常量 ====================
 // 获取链配置
@@ -102,7 +102,8 @@ function getChainConfig(chain) {
 }
 // ==================== 工具函数 ====================
 /** 构建 ERC20 approve 交易 */
-async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amount, nonce, gasPrice, txType, chainId = 56) {
+async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amount, nonce, gasPrice, txType, chainId = 56 // ✅ 添加 chainId 参数
+) {
     const erc20Interface = new ethers.Interface(ERC20_ABI);
     const data = erc20Interface.encodeFunctionData('approve', [spenderAddress, amount]);
     const tx = {
@@ -110,9 +111,9 @@ async function buildApproveTransaction(wallet, tokenAddress, spenderAddress, amo
         data,
         from: wallet.address,
         nonce,
-        gasLimit: BigInt(100_000), // approve 交易 gas 较低
+        gasLimit: BigInt(100000), // approve 交易 gas 较低
         chainId,
-        type: txType,
+        type: txType
     };
     if (txType === 2) {
         const priorityFee = gasPrice / 10n === 0n ? 1n : gasPrice / 10n;
@@ -166,11 +167,11 @@ function parseQuoteAmount(amount, useNativeToken, quoteTokenDecimals) {
  * 若 SDK 这里再次 splitAmount，会导致实际 buyAmount 与 UI/预期不一致，并引发余额不足（insufficient funds）。
  */
 function resolveBuyerAmounts(buyers, totalAmountStr, useNativeToken, quoteTokenDecimals) {
-    const provided = buyers.map((b) => b?.buyAmount).filter((v) => v != null && String(v).trim() !== '');
+    const provided = buyers.map(b => b?.buyAmount).filter(v => v != null && String(v).trim() !== '');
     const allProvided = provided.length === buyers.length;
     if (allProvided) {
         // ✅ 所有买家都显式提供了 buyAmount：按传入金额构建，但要修正“浮点/四舍五入导致总和偏差”
-        const amounts = buyers.map((b) => parseQuoteAmount(String(b.buyAmount), useNativeToken, quoteTokenDecimals));
+        const amounts = buyers.map(b => parseQuoteAmount(String(b.buyAmount), useNativeToken, quoteTokenDecimals));
         const totalWei = parseQuoteAmount(totalAmountStr, useNativeToken, quoteTokenDecimals);
         const sum = amounts.reduce((a, b) => a + b, 0n);
         const delta = totalWei - sum;
@@ -200,7 +201,7 @@ function resolveBuyerAmounts(buyers, totalAmountStr, useNativeToken, quoteTokenD
  * 5. 利润多跳转账
  */
 export async function flapBundleCreateToDex(params) {
-    const { chain, devPrivateKey, tokenInfo, tokenAddress, quoteToken, quoteTokenDecimals = 18, curveBuyers, curveTotalBuyAmount, enableDexBuy = false, dexBuyers = [], dexTotalBuyAmount, dexPoolType = 'v3', v3Fee = 2500, config, } = params;
+    const { chain, devPrivateKey, tokenInfo, tokenAddress, quoteToken, quoteTokenDecimals = 18, curveBuyers, curveTotalBuyAmount, enableDexBuy = false, dexBuyers = [], dexTotalBuyAmount, dexPoolType = 'v3', v3Fee = 2500, config } = params;
     // 验证参数
     if (curveBuyers.length === 0) {
         throw new Error('至少需要一个内盘买入钱包');
@@ -234,30 +235,34 @@ export async function flapBundleCreateToDex(params) {
     // 创建 Provider
     const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
         chainId,
-        name: chain.toUpperCase(),
+        name: chain.toUpperCase()
     });
     const portalAddress = FLAP_PORTAL_ADDRESSES[chain.toUpperCase()];
     const originalPortalAddress = FLAP_ORIGINAL_PORTAL_ADDRESSES[chain.toUpperCase()];
     const nonceManager = new NonceManager(provider);
     // 创建钱包实例
     const devWallet = new Wallet(devPrivateKey, provider);
-    const curveWallets = curveBuyers.map((b) => ({
+    const curveWallets = curveBuyers.map(b => ({
         wallet: new Wallet(b.privateKey, provider),
-        buyAmount: b.buyAmount,
+        buyAmount: b.buyAmount
     }));
-    const dexWallets = (enableDexBuy ? dexBuyers : []).map((b) => ({
+    const dexWallets = (enableDexBuy ? dexBuyers : []).map(b => ({
         wallet: new Wallet(b.privateKey, provider),
-        buyAmount: b.buyAmount,
+        buyAmount: b.buyAmount
     }));
     // ✅ 并行获取 gasPrice + 所有钱包 nonces
-    const allWallets = [devWallet, ...curveWallets.map((c) => c.wallet), ...dexWallets.map((d) => d.wallet)];
+    const allWallets = [
+        devWallet,
+        ...curveWallets.map(c => c.wallet),
+        ...dexWallets.map(d => d.wallet)
+    ];
     const uniqueWallets = allWallets.filter((w, i) => {
         const addr = w.address.toLowerCase();
-        return allWallets.findIndex((x) => x.address.toLowerCase() === addr) === i;
+        return allWallets.findIndex(x => x.address.toLowerCase() === addr) === i;
     });
     const [gasPrice, noncesArray] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        nonceManager.getNextNoncesForWallets(uniqueWallets),
+        nonceManager.getNextNoncesForWallets(uniqueWallets)
     ]);
     // 构建 nonces Map
     const noncesMap = new Map();
@@ -277,8 +282,9 @@ export async function flapBundleCreateToDex(params) {
         dexBuyAmounts = resolveBuyerAmounts(dexBuyers, dexTotalBuyAmount, useNativeToken, quoteTokenDecimals);
     }
     // ✅ 计算利润
-    const totalBuyAmount = curveBuyAmounts.reduce((a, b) => a + b, 0n) + dexBuyAmounts.reduce((a, b) => a + b, 0n);
-    const profitAmount = (totalBuyAmount * BigInt(getProfitRateBps())) / 10000n;
+    const totalBuyAmount = curveBuyAmounts.reduce((a, b) => a + b, 0n)
+        + dexBuyAmounts.reduce((a, b) => a + b, 0n);
+    const profitAmount = (totalBuyAmount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
     // ==================== 构建交易 ====================
     const allTransactions = [];
     // 使用第一个内盘买家作为贿赂支付者（提高 bundle 打包优先级）
@@ -295,7 +301,7 @@ export async function flapBundleCreateToDex(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId,
-            type: txType,
+            type: txType
         });
         allTransactions.push(bribeTx);
     }
@@ -322,42 +328,30 @@ export async function flapBundleCreateToDex(params) {
             if (total !== 10000) {
                 throw new Error(`Tax distribution must sum to 10000 (100%), got ${total}`);
             }
-            // ✅ 判断是否使用金库模式（VaultPortal.newTaxTokenWithVault）
+            // ✅ 判断是否使用金库模式（VaultPortal.newTokenV6WithVault + TOKEN_TAXED_V3）
             const hasVault = tv2.vaultConfig && tv2.vaultConfig.vaultType !== 'none';
             if (hasVault) {
-                // ✅ 金库模式：通过 VaultPortal.newTaxTokenWithVault 创建代币
+                // ✅ 金库模式：通过 VaultPortal.newTokenV6WithVault 创建代币
                 const chainKey = chain.toUpperCase();
                 const vaultPortalAddr = VAULT_PORTAL_ADDRESSES[chainKey];
                 if (!vaultPortalAddr) {
                     throw new Error(`链 "${chain}" 不支持 Tax Vault 金库功能`);
                 }
                 const vaultPortal = new Contract(vaultPortalAddr, VAULT_PORTAL_ABI, devWallet);
-                const { vaultFactory, vaultData } = buildVaultParams(tv2.vaultConfig, chainKey);
-                createUnsigned = await vaultPortal.newTaxTokenWithVault.populateTransaction({
-                    name: tokenInfo.name,
-                    symbol: tokenInfo.symbol,
-                    meta: tokenInfo.meta,
-                    dexThresh: (params.dexThresh ?? 1) & 0xff,
-                    salt: params.salt ?? '0x' + '00'.repeat(32),
-                    taxRate: (params.taxRate ?? 0) & 0xffff,
-                    migratorType: (params.migratorType ?? 0) & 0xff,
+                const v6Params = buildNewTokenV6WithVaultParams({
+                    tokenInfo,
+                    taxV2: tv2,
+                    chain: chainKey,
+                    salt: params.salt ?? ('0x' + '00'.repeat(32)),
+                    taxRate: params.taxRate ?? 0,
+                    dexThresh: params.dexThresh,
+                    migratorType: params.migratorType,
                     quoteToken: inputToken,
                     quoteAmt: 0n,
-                    permitData: '0x',
-                    extensionID: '0x' + '00'.repeat(32),
-                    extensionData: '0x',
-                    dexId: (params.dexId ?? 0) & 0xff,
-                    lpFeeProfile: (params.lpFeeProfile ?? 0) & 0xff,
-                    taxDuration: BigInt(tv2.taxDuration),
-                    antiFarmerDuration: BigInt(tv2.antiFarmerDuration),
-                    mktBps: tv2.mktBps & 0xffff,
-                    deflationBps: tv2.deflationBps & 0xffff,
-                    dividendBps: tv2.dividendBps & 0xffff,
-                    lpBps: tv2.lpBps & 0xffff,
-                    minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * 10n ** 18n,
-                    vaultFactory,
-                    vaultData,
+                    dexId: params.dexId,
+                    lpFeeProfile: params.lpFeeProfile,
                 });
+                createUnsigned = await vaultPortal.newTokenV6WithVault.populateTransaction(v6Params);
             }
             else {
                 // 标准 V5: Portal.newTokenV5（无金库）
@@ -383,7 +377,7 @@ export async function flapBundleCreateToDex(params) {
                     deflationBps: tv2.deflationBps & 0xffff,
                     dividendBps: tv2.dividendBps & 0xffff,
                     lpBps: tv2.lpBps & 0xffff,
-                    minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * 10n ** 18n,
+                    minimumShareBalance: BigInt(tv2.minimumShareBalance ?? 10000) * (10n ** 18n),
                 });
             }
         }
@@ -404,7 +398,7 @@ export async function flapBundleCreateToDex(params) {
                 extensionID: params.extensionID ?? '0x' + '00'.repeat(32),
                 extensionData: params.extensionData ?? '0x',
                 dexId: (params.dexId ?? 0) & 0xff,
-                lpFeeProfile: (params.lpFeeProfile ?? 0) & 0xff,
+                lpFeeProfile: (params.lpFeeProfile ?? 0) & 0xff
             });
         }
         else if (useV3) {
@@ -422,7 +416,7 @@ export async function flapBundleCreateToDex(params) {
                 beneficiary: devWallet.address,
                 permitData: '0x',
                 extensionID: params.extensionID,
-                extensionData: params.extensionData ?? '0x',
+                extensionData: params.extensionData ?? '0x'
             });
         }
         else {
@@ -438,7 +432,7 @@ export async function flapBundleCreateToDex(params) {
                 quoteToken: inputToken,
                 quoteAmt: 0n,
                 beneficiary: devWallet.address,
-                permitData: '0x',
+                permitData: '0x'
             });
         }
         const createTx = {
@@ -447,7 +441,7 @@ export async function flapBundleCreateToDex(params) {
             nonce: devNonce,
             gasLimit: finalGasLimit,
             chainId,
-            type: txType,
+            type: txType
         };
         if (txType === 2) {
             createTx.maxFeePerGas = gasPrice;
@@ -469,7 +463,8 @@ export async function flapBundleCreateToDex(params) {
         if (!useNativeToken) {
             const approveNonce = noncesMap.get(addr);
             noncesMap.set(addr, approveNonce + 1);
-            const approveTx = await buildApproveTransaction(wallet, quoteToken, portalAddress, curveBuyAmounts[i], approveNonce, gasPrice, txType, chainId);
+            const approveTx = await buildApproveTransaction(wallet, quoteToken, portalAddress, curveBuyAmounts[i], approveNonce, gasPrice, txType, chainId // ✅ 传递 chainId
+            );
             signedTxs.push(approveTx);
         }
         // 构建买入交易
@@ -485,18 +480,16 @@ export async function flapBundleCreateToDex(params) {
             inputAmount: curveBuyAmounts[i],
             minOutputAmount: 0n,
             permitData: '0x', // 不使用 permit，使用链上 approve
-            extensionData,
+            extensionData
         }, useNativeToken ? { value: curveBuyAmounts[i] } : {});
         // 最后一个买家触发毕业，需要更多 gas
         const isLastBuyer = i === curveWallets.length - 1;
         // ⚠️ 触发毕业（创建 Pancake V3 池 + Mint 初始流动性）会非常耗 gas。
         // 链上成功样例 0x29b173... 的 gasLimit=8,000,000，gasUsed≈6,647,149。
         // Flap 官方示例脚本也使用 last_buy=8_000_000。
-        const LAST_BUY_GAS_LIMIT = BigInt(8_000_000);
+        const LAST_BUY_GAS_LIMIT = BigInt(8000000);
         const buyGasLimit = isLastBuyer
-            ? finalGasLimit > LAST_BUY_GAS_LIMIT
-                ? finalGasLimit
-                : LAST_BUY_GAS_LIMIT
+            ? (finalGasLimit > LAST_BUY_GAS_LIMIT ? finalGasLimit : LAST_BUY_GAS_LIMIT)
             : finalGasLimit;
         const tx = {
             ...unsigned,
@@ -505,7 +498,7 @@ export async function flapBundleCreateToDex(params) {
             gasLimit: buyGasLimit,
             chainId,
             type: txType,
-            value: useNativeToken ? curveBuyAmounts[i] : 0n,
+            value: useNativeToken ? curveBuyAmounts[i] : 0n
         };
         if (txType === 2) {
             tx.maxFeePerGas = gasPrice;
@@ -520,11 +513,11 @@ export async function flapBundleCreateToDex(params) {
     });
     const curveBuyResults = await Promise.all(curveBuyTxPromises);
     // 展平数组：每个钱包可能有 [approve, buy] 或只有 [buy]
-    curveBuyResults.forEach((txs) => allTransactions.push(...txs));
+    curveBuyResults.forEach(txs => allTransactions.push(...txs));
     // 4. 外盘买入交易（直接调用 PancakeSwap Router）
     // ✅ 重要修改：直接调用 PancakeSwap SmartRouter
     // 参考官方代码: flap-bundle-release/app/v2/pvp/001_launch_buy.ts
-    //
+    // 
     // ⚠️ 关键：税代币（migratorType=1）毕业到 V2 池，必须用 swapExactTokensForTokens
     //         普通代币（migratorType=0）毕业到 V3 池，使用 exactInputSingle
     if (enableDexBuy && dexWallets.length > 0) {
@@ -547,7 +540,7 @@ export async function flapBundleCreateToDex(params) {
         // migratorType === 1 (V2_MIGRATOR) → 毕业到 V2 池 → 必须使用 V2 买入
         // migratorType === 0 (V3_MIGRATOR) → 毕业到 V3 池 → 使用 V3 买入
         // 参考: flap-bundle-release 中税代币使用 PoolType.V2，普通代币使用 PoolType.V3
-        const effectiveDexPoolType = params.migratorType === 1 ? 'v2' : dexPoolType || 'v3';
+        const effectiveDexPoolType = (params.migratorType === 1) ? 'v2' : (dexPoolType || 'v3');
         // 获取 V3 费率（仅 V3 池使用）
         const dexV3Fee = actualV3Fee;
         const dexBuyTxPromises = dexWallets.map(async ({ wallet }, i) => {
@@ -576,7 +569,7 @@ export async function flapBundleCreateToDex(params) {
                     buyAmount,
                     0n, // amountOutMin: 不设置滑点保护（Bundle 中可以接受）
                     [tokenIn, tokenAddress], // path: WBNB/QuoteToken → Token
-                    wallet.address, // recipient
+                    wallet.address // recipient
                 ]);
                 multicallData = routerInterface.encodeFunctionData('multicall', [[swapData]]);
             }
@@ -589,14 +582,14 @@ export async function flapBundleCreateToDex(params) {
                     recipient: wallet.address,
                     amountIn: buyAmount,
                     amountOutMinimum: 0n, // 不设置滑点保护（Bundle 中可以接受）
-                    sqrtPriceLimitX96: 0n,
+                    sqrtPriceLimitX96: 0n
                 };
                 const exactInputSingleData = routerInterface.encodeFunctionData('exactInputSingle', [exactInputSingleParams]);
                 multicallData = routerInterface.encodeFunctionData('multicall', [[exactInputSingleData]]);
             }
             // ⚠️ Pancake SmartRouter 外盘买的 gas 不能太小，否则 bundle 预执行会直接失败。
             // Flap 官方示例配置 dex_buy=5_000_000（flap-bundle-release/app/configs/global.ts）。
-            const DEX_BUY_GAS_LIMIT = BigInt(8_000_000);
+            const DEX_BUY_GAS_LIMIT = BigInt(8000000);
             const tx = {
                 to: smartRouterAddress,
                 data: multicallData,
@@ -604,7 +597,7 @@ export async function flapBundleCreateToDex(params) {
                 gasLimit: DEX_BUY_GAS_LIMIT,
                 chainId,
                 type: txType,
-                value: useNativeToken ? buyAmount : 0n,
+                value: useNativeToken ? buyAmount : 0n
             };
             if (txType === 2) {
                 tx.maxFeePerGas = gasPrice;
@@ -619,7 +612,7 @@ export async function flapBundleCreateToDex(params) {
         });
         const dexBuyResults = await Promise.all(dexBuyTxPromises);
         // 展平数组：每个钱包可能有 [approve, buy] 或只有 [buy]
-        dexBuyResults.forEach((txs) => allTransactions.push(...txs));
+        dexBuyResults.forEach(txs => allTransactions.push(...txs));
     }
     // 5. 利润多跳转账
     let profitHopWallets;
@@ -637,7 +630,7 @@ export async function flapBundleCreateToDex(params) {
             gasPrice,
             chainId,
             txType,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         allTransactions.push(...profitResult.signedTransactions);
         profitHopWallets = profitResult.hopWallets;
@@ -654,7 +647,7 @@ export async function flapBundleCreateToDex(params) {
             enableDexBuy,
             dexBuyerCount: dexBuyers.length,
             dexTotalBuy: dexBuyAmounts.length > 0 ? ethers.formatEther(dexBuyAmounts.reduce((a, b) => a + b, 0n)) : '0',
-            profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined,
-        },
+            profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
+        }
     };
 }