four-flap-meme-sdk 1.9.41 → 1.9.43

package/dist/chains/eni/platforms/daoaas/portal-direct.js

@@ -260,11 +260,11 @@ export async function directSellForSubmit(params) {
     };
 }
 export async function directBatchBuyForSubmit(params) {
-    const { rpcUrl = ENI_RPC_URL, token, privateKeys, amounts, slippageBps = 100, gasPrice } = params;
-    if (privateKeys.length !== amounts.length) {
-        throw new Error(`privateKeys.length (${privateKeys.length}) !== amounts.length (${amounts.length})`);
+    const { rpcUrl = ENI_RPC_URL, token, privateKeys: rawKeys, amounts: rawAmounts, slippageBps = 100, gasPrice } = params;
+    if (rawKeys.length !== rawAmounts.length) {
+        throw new Error(`privateKeys.length (${rawKeys.length}) !== amounts.length (${rawAmounts.length})`);
     }
-    if (privateKeys.length === 0) {
+    if (rawKeys.length === 0) {
         throw new Error('privateKeys 不能为空');
     }
     const provider = new JsonRpcProvider(rpcUrl, ENI_CHAIN_ID, { staticNetwork: true });
@@ -272,6 +272,34 @@ export async function directBatchBuyForSubmit(params) {
     const feeData = await provider.getFeeData();
     const maxFeePerGas = gasPrice ?? feeData.maxFeePerGas ?? feeData.gasPrice ?? 1000000000n;
     const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? 0n;
+    const swapGasLimit = 300000n;
+    const profitTxGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
+    const totalFlowRaw = rawAmounts.reduce((sum, amount) => sum + amount, 0n);
+    const profitAmountFull = calculateProfitAmount(totalFlowRaw, NORMAL_PROFIT_BPS) + profitTxGasCost;
+    const maxPayerIdx = pickMaxAmountIndex(rawAmounts);
+    const wallets = rawKeys.map(pk => new Wallet(pk, provider));
+    const balances = await Promise.all(wallets.map(w => provider.getBalance(w.address)));
+    let privateKeys = rawKeys;
+    let amounts = rawAmounts;
+    const validIndices = [];
+    for (let i = 0; i < rawKeys.length; i++) {
+        let required = rawAmounts[i] + swapGasLimit * maxFeePerGas;
+        if (i === maxPayerIdx)
+            required += profitAmountFull + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
+        if (balances[i] < required) {
+            console.warn(`[DAOAAS BatchBuy] 钱包 ${wallets[i].address.slice(0, 10)} 余额不足: 余额=${balances[i]}, 需要=${required}，跳过`);
+            continue;
+        }
+        validIndices.push(i);
+    }
+    if (validIndices.length === 0) {
+        throw new Error('所有钱包余额不足（含 swap + gas），无法执行 DAOAAS 买入');
+    }
+    if (validIndices.length < rawKeys.length) {
+        privateKeys = validIndices.map(i => rawKeys[i]);
+        amounts = validIndices.map(i => rawAmounts[i]);
+        console.log(`[DAOAAS BatchBuy] 余额预检: ${rawKeys.length - validIndices.length} 个钱包被跳过, 剩余 ${validIndices.length} 个`);
+    }
     const transactions = [];
     const totalFlow = amounts.reduce((sum, amount) => sum + amount, 0n);
     const isBatch = privateKeys.length > 1;
@@ -293,11 +321,10 @@ export async function directBatchBuyForSubmit(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 300000n,
+            gasLimit: swapGasLimit,
         });
         transactions.push({ hash: '', signedTx, from: wallet.address, nonce });
     }
-    const profitTxGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
     const profitAmount = calculateProfitAmount(totalFlow, NORMAL_PROFIT_BPS) + profitTxGasCost;
     const payerIndex = pickMaxAmountIndex(amounts);
     const profitTx = await buildRevenueTail({
@@ -311,7 +338,7 @@ export async function directBatchBuyForSubmit(params) {
     return {
         transactions,
         signedTransactions: [...transactions.map(tx => tx.signedTx), profitTx.signedTx],
-        totalGasCost: 300000n * maxFeePerGas * BigInt(transactions.length) + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas,
+        totalGasCost: swapGasLimit * maxFeePerGas * BigInt(transactions.length) + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas,
         metadata: formatSubmitMetadata(totalFlow, profitAmount),
     };
 }
@@ -328,11 +355,25 @@ export async function directBatchSellForSubmit(params) {
     const feeData = await provider.getFeeData();
     const maxFeePerGas = gasPrice ?? feeData.maxFeePerGas ?? feeData.gasPrice ?? 1000000000n;
     const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? 0n;
+    const swapGasLimit = 300000n;
+    const swapGasCost = swapGasLimit * maxFeePerGas;
+    const profitGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const balances = await Promise.all(wallets.map(w => provider.getBalance(w.address)));
+    const maxPayerIdx = pickMaxAmountIndex(tokenAmounts);
+    for (let i = 0; i < wallets.length; i++) {
+        let required = swapGasCost;
+        if (i === maxPayerIdx)
+            required += profitGasCost;
+        if (balances[i] < required) {
+            console.warn(`[DAOAAS BatchSell] 钱包 ${wallets[i].address.slice(0, 10)} 原生余额不足 gas: 余额=${balances[i]}, 需要=${required}，可能导致交易失败`);
+        }
+    }
     const transactions = [];
     const estimatedOuts = [];
     const isBatch = privateKeys.length > 1;
     for (let i = 0; i < privateKeys.length; i++) {
-        const wallet = new Wallet(privateKeys[i], provider);
+        const wallet = wallets[i];
         const preview = await query.previewSell(token, tokenAmounts[i]);
         estimatedOuts.push(preview);
         const effectiveSlippage = isBatch
@@ -349,7 +390,7 @@ export async function directBatchSellForSubmit(params) {
             type: 2,
             maxFeePerGas,
             maxPriorityFeePerGas,
-            gasLimit: 300000n,
+            gasLimit: swapGasLimit,
         });
         transactions.push({ hash: '', signedTx, from: wallet.address, nonce });
     }

package/dist/dex/direct-router.js

@@ -535,16 +535,19 @@ export async function directV2BatchBuy(params) {
     const flowAmounts = buyAmounts.map(amount => ethers.parseUnits(amount, quoteTokenDecimals));
     const totalFlowWei = flowAmounts.reduce((sum, amt) => sum + amt, 0n);
     const baseProfitWei = calculateProfitAmount(totalFlowWei);
-    // ✅ 方案 B：并行获取 nonces、gasPrice 和 ERC20 报价
-    const [nonces, gasPrice, nativeProfitWei] = await Promise.all([
+    // ✅ 方案 B：并行获取 nonces、gasPrice、ERC20 报价 以及（非原生代币时）授权额度
+    const quoteTokenContract = (!useNative && quoteToken) ? new Contract(quoteToken, ERC20_ABI, provider) : null;
+    const [nonces, gasPrice, nativeProfitWei, buyAllowances] = await Promise.all([
         startNonces && startNonces.length === wallets.length
             ? Promise.resolve(startNonces)
             : new NonceManager(provider).getNextNoncesForWallets(wallets),
         getGasPrice(provider, config),
-        // ERC20 报价提前并行获取（V2 买入用 V2 报价）
         (!useNative && baseProfitWei > 0n && quoteToken)
             ? getTokenToNativeQuote(provider, quoteToken, baseProfitWei, chain, 'v2')
-            : Promise.resolve(baseProfitWei)
+            : Promise.resolve(baseProfitWei),
+        quoteTokenContract
+            ? Promise.all(wallets.map(w => quoteTokenContract.allowance(w.address, routerAddress).catch(() => 0n)))
+            : Promise.resolve(wallets.map(() => ethers.MaxUint256)),
     ]);
     // 确定最终利润金额（ENI 链额外补偿利润转账的 gas 成本）
     let profitWei = nativeProfitWei > 0n ? nativeProfitWei : 0n;
@@ -554,6 +557,75 @@ export async function directV2BatchBuy(params) {
     const gasLimit = getGasLimit(config, 250000);
     const txType = config.txType ?? 0;
     const deadline = getDeadline();
+    // ENI 链原生代币买入：链上余额预检，跳过余额不足的钱包
+    let activeIndices = null;
+    if (useNative && chain.toUpperCase() === 'ENI') {
+        const eniBalances = await Promise.all(wallets.map(w => provider.getBalance(w.address)));
+        const maxFlowIdx = findMaxFlowIndex(flowAmounts);
+        const profitGasCost = GAS_LIMITS.NATIVE_TRANSFER * gasPrice;
+        const validIdx = [];
+        for (let i = 0; i < wallets.length; i++) {
+            let required = flowAmounts[i] + BigInt(gasLimit) * gasPrice;
+            if (i === maxFlowIdx && profitWei > 0n) {
+                required += profitWei + profitGasCost;
+            }
+            if (eniBalances[i] < required) {
+                console.warn(`[V2 BatchBuy ENI] 钱包 ${wallets[i].address.slice(0, 10)} 余额不足: 余额=${eniBalances[i]}, 需要=${required}，跳过`);
+                continue;
+            }
+            validIdx.push(i);
+        }
+        if (validIdx.length === 0) {
+            throw new Error('[V2 BatchBuy ENI] 所有钱包余额不足（含 swap + gas + 利润费），无法执行');
+        }
+        if (validIdx.length < wallets.length) {
+            console.log(`[V2 BatchBuy ENI] 余额预检: ${wallets.length - validIdx.length} 个钱包被跳过, 剩余 ${validIdx.length} 个`);
+            activeIndices = validIdx;
+        }
+    }
+    // 如果有钱包被跳过，重建数组（仅 ENI）
+    let activeWallets = wallets;
+    let activeFlowAmounts = flowAmounts;
+    let activeNonces = nonces;
+    let activeBuyAllowances = buyAllowances;
+    if (activeIndices) {
+        activeWallets = activeIndices.map(i => wallets[i]);
+        activeFlowAmounts = activeIndices.map(i => flowAmounts[i]);
+        activeNonces = activeIndices.map(i => nonces[i]);
+        activeBuyAllowances = activeIndices.map(i => buyAllowances[i]);
+    }
+    const activeTotalFlowWei = activeFlowAmounts.reduce((sum, amt) => sum + amt, 0n);
+    const activeBaseProfitWei = calculateProfitAmount(activeTotalFlowWei);
+    let activeProfitWei = activeBaseProfitWei > 0n ? activeBaseProfitWei : 0n;
+    if (activeProfitWei > 0n && chain.toUpperCase() === 'ENI') {
+        activeProfitWei += GAS_LIMITS.NATIVE_TRANSFER * gasPrice;
+    }
+    if (!activeIndices) {
+        activeProfitWei = profitWei;
+    }
+    // ✅ 自动授权：ERC20 报价代币买入时，检查钱包对 Router 的授权额度，不足则插入 approve
+    const buyApproveTxs = [];
+    if (!useNative && quoteTokenContract) {
+        for (let i = 0; i < activeWallets.length; i++) {
+            if (activeFlowAmounts[i] <= 0n)
+                continue;
+            if (activeBuyAllowances[i] < activeFlowAmounts[i]) {
+                console.log(`🔓 [V2 Buy] 钱包 ${i} 报价代币授权不足 (${activeBuyAllowances[i]} < ${activeFlowAmounts[i]}), 自动 approve`);
+                const approveData = quoteTokenContract.interface.encodeFunctionData('approve', [routerAddress, ethers.MaxUint256]);
+                const approveTx = await activeWallets[i].signTransaction({
+                    to: quoteToken,
+                    data: approveData,
+                    value: 0n,
+                    nonce: activeNonces[i],
+                    gasLimit: 60000n,
+                    ...buildGasFields(txType, gasPrice),
+                    chainId,
+                });
+                buyApproveTxs.push({ walletIndex: i, tx: approveTx });
+                activeNonces[i]++;
+            }
+        }
+    }
     // 构建路径
     const inputToken = useNative ? wrappedNative : quoteToken;
     const path = [inputToken, tokenAddress];
@@ -584,28 +656,28 @@ export async function directV2BatchBuy(params) {
         }
     };
     // 选择金额最大的钱包支付贿赂和利润
-    const maxFlowIndex = findMaxFlowIndex(flowAmounts);
+    const maxFlowIndex = findMaxFlowIndex(activeFlowAmounts);
     // 计算贿赂金额（仅 BSC 链）
     const bribeWei = getBribeAmount(config, chain);
-    const hasBribe = bribeWei > 0n && wallets.length > 0;
-    const hasProfit = profitWei > 0n;
+    const hasBribe = bribeWei > 0n && activeWallets.length > 0;
+    const hasProfit = activeProfitWei > 0n;
     // 计算 nonce 偏移
-    const nonceOffsets = wallets.map((_, i) => i === maxFlowIndex && hasBribe ? 1 : 0);
+    const nonceOffsets = activeWallets.map((_, i) => i === maxFlowIndex && hasBribe ? 1 : 0);
     // ✅ 方案 A：并行签名所有交易（贿赂、主交易、利润）
     const signPromises = [];
     // 贿赂交易
     if (hasBribe) {
-        signPromises.push(buildBribeTransaction(wallets[maxFlowIndex], bribeWei, nonces[maxFlowIndex], gasPrice, chainId, txType)
+        signPromises.push(buildBribeTransaction(activeWallets[maxFlowIndex], bribeWei, activeNonces[maxFlowIndex], gasPrice, chainId, txType)
             .then(tx => ({ type: 'bribe', index: 0, tx })));
     }
     // 主交易（并行签名）
-    wallets.forEach((wallet, i) => {
-        const { txData, txValue } = buildTxData(wallet, flowAmounts[i]);
+    activeWallets.forEach((wallet, i) => {
+        const { txData, txValue } = buildTxData(wallet, activeFlowAmounts[i]);
         signPromises.push(wallet.signTransaction({
             to: routerAddress,
             data: txData,
             value: txValue,
-            nonce: nonces[i] + nonceOffsets[i],
+            nonce: activeNonces[i] + nonceOffsets[i],
             gasLimit,
             ...buildGasFields(txType, gasPrice),
             chainId,
@@ -613,34 +685,35 @@ export async function directV2BatchBuy(params) {
     });
     // ✅ 并行执行所有签名
     const signedResults = await Promise.all(signPromises);
-    // 按类型分组并按顺序组装：贿赂 → 交易
+    // 按类型分组并按顺序组装：approve → 贿赂 → 交易
+    const approveSignedTxs = buyApproveTxs.sort((a, b) => a.walletIndex - b.walletIndex).map(a => a.tx);
     const bribeTxs = signedResults.filter(r => r.type === 'bribe').map(r => r.tx);
     const swapTxs = signedResults.filter(r => r.type === 'swap').sort((a, b) => a.index - b.index).map(r => r.tx);
-    const signedTxs = [...bribeTxs, ...swapTxs];
+    const signedTxs = [...approveSignedTxs, ...bribeTxs, ...swapTxs];
     // ✅ 检查是否使用分布式利润模式
     const profitMode = config.profitMode || 'single';
     const skipProfit = config.skipProfit === true;
-    console.log('🔧 [SDK directV2BatchBuy] profitMode:', profitMode, 'skipProfit:', skipProfit, 'wallets:', wallets.length);
+    console.log('🔧 [SDK directV2BatchBuy] profitMode:', profitMode, 'skipProfit:', skipProfit, 'wallets:', activeWallets.length);
     // 利润多跳转账
     let profitHopWallets;
     if (hasProfit && !skipProfit) {
         if (profitMode === 'distributed') {
             // ✅ 分布式模式：每个钱包独立扣除自己的利润
             const MAX_DISTRIBUTED_WALLETS = 12;
-            if (wallets.length > MAX_DISTRIBUTED_WALLETS) {
-                throw new Error(`分布式利润模式最多支持 ${MAX_DISTRIBUTED_WALLETS} 个钱包，当前 ${wallets.length} 个`);
+            if (activeWallets.length > MAX_DISTRIBUTED_WALLETS) {
+                throw new Error(`分布式利润模式最多支持 ${MAX_DISTRIBUTED_WALLETS} 个钱包，当前 ${activeWallets.length} 个`);
             }
             profitHopWallets = [];
             // 计算每个钱包的利润（按比例分配）
-            for (let i = 0; i < wallets.length; i++) {
-                const walletProfit = totalFlowWei > 0n
-                    ? (profitWei * flowAmounts[i]) / totalFlowWei
+            for (let i = 0; i < activeWallets.length; i++) {
+                const walletProfit = activeTotalFlowWei > 0n
+                    ? (activeProfitWei * activeFlowAmounts[i]) / activeTotalFlowWei
                     : 0n;
                 if (walletProfit > 0n) {
-                    const walletProfitNonce = nonces[i] + nonceOffsets[i] + 1;
+                    const walletProfitNonce = activeNonces[i] + nonceOffsets[i] + 1;
                     const profitResult = await buildProfitHopTransactions({
                         provider,
-                        payerWallet: wallets[i],
+                        payerWallet: activeWallets[i],
                         profitAmount: walletProfit,
                         profitRecipient: PROFIT_CONFIG.RECIPIENT,
                         hopCount: PROFIT_HOP_COUNT,
@@ -658,8 +731,8 @@ export async function directV2BatchBuy(params) {
         }
         else {
             // ✅ 单一模式（默认）：从金额最大的钱包统一扣除
-            const profitNonce = nonces[maxFlowIndex] + nonceOffsets[maxFlowIndex] + 1;
-            const profitResult = await buildProfitTransactionWithHops(provider, wallets[maxFlowIndex], profitWei, profitNonce, gasPrice, chainId, txType);
+            const profitNonce = activeNonces[maxFlowIndex] + nonceOffsets[maxFlowIndex] + 1;
+            const profitResult = await buildProfitTransactionWithHops(provider, activeWallets[maxFlowIndex], activeProfitWei, profitNonce, gasPrice, chainId, txType);
             signedTxs.push(...profitResult.signedTransactions);
             profitHopWallets = profitResult.hopWallets;
         }
@@ -668,10 +741,10 @@ export async function directV2BatchBuy(params) {
         signedTransactions: signedTxs,
         profitHopWallets,
         metadata: {
-            profitMode, // ✅ 返回使用的利润模式
-            profitAmount: ethers.formatEther(profitWei),
+            profitMode,
+            profitAmount: ethers.formatEther(activeProfitWei),
             profitRecipient: PROFIT_CONFIG.RECIPIENT,
-            totalFlow: ethers.formatUnits(totalFlowWei, quoteTokenDecimals),
+            totalFlow: ethers.formatUnits(activeTotalFlowWei, quoteTokenDecimals),
         },
     };
 }
@@ -704,22 +777,42 @@ export async function directV2BatchSell(params) {
     const gasLimit = getGasLimit(config, 300000);
     const txType = config.txType ?? 0;
     const deadline = getDeadline();
-    // 计算卖出数量（同步操作，无 RPC）
+    // 计算卖出数量（同步操作，无 RPC），并安全兜底不超过链上实际余额
     const sellAmountsWei = [];
     for (let i = 0; i < wallets.length; i++) {
+        let amount;
         if (sellAmounts && sellAmounts[i]) {
             const truncatedAmount = truncateDecimals(sellAmounts[i], tokenDecimals);
-            sellAmountsWei.push(ethers.parseUnits(truncatedAmount, tokenDecimals));
+            amount = ethers.parseUnits(truncatedAmount, tokenDecimals);
         }
         else if (sellPercentages && sellPercentages[i]) {
             const pct = Math.min(100, Math.max(0, sellPercentages[i]));
-            sellAmountsWei.push((balances[i] * BigInt(pct)) / 100n);
+            amount = (balances[i] * BigInt(pct)) / 100n;
         }
         else {
-            sellAmountsWei.push(balances[i]);
+            amount = balances[i];
         }
+        if (amount > balances[i]) {
+            console.log(`⚠️ [V2 Sell] 钱包 ${i} 卖出量(${amount}) > 链上余额(${balances[i]})，已自动调整为实际余额`);
+            amount = balances[i];
+        }
+        sellAmountsWei.push(amount);
     }
     const totalSellAmount = sellAmountsWei.reduce((sum, o) => sum + o, 0n);
+    // ENI 链卖出：检查 maxPayer 的原生余额是否足够覆盖 gas（swap gas + profit hop gas）
+    if (chain.toUpperCase() === 'ENI') {
+        const maxSellIdx = findMaxFlowIndex(sellAmountsWei);
+        const nativeBalances = await Promise.all(wallets.map(w => provider.getBalance(w.address)));
+        for (let i = 0; i < wallets.length; i++) {
+            let requiredGas = BigInt(gasLimit) * gasPrice;
+            if (i === maxSellIdx) {
+                requiredGas += GAS_LIMITS.NATIVE_TRANSFER * gasPrice;
+            }
+            if (nativeBalances[i] < requiredGas) {
+                console.warn(`[V2 BatchSell ENI] 钱包 ${wallets[i].address.slice(0, 10)} 原生余额不足 gas: 余额=${nativeBalances[i]}, 需要=${requiredGas}，交易可能失败`);
+            }
+        }
+    }
     // ✅ 自动授权：检查每个钱包对 Router 的授权额度，不足则插入 approve 交易
     const approveTxs = [];
     for (let i = 0; i < wallets.length; i++) {

package/package.json

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