four-flap-meme-sdk 1.7.80 → 1.7.82

package/dist/contracts/tm-bundle-merkle/utils.js

@@ -1,7 +1,7 @@
 import { ethers, Wallet } from 'ethers';
 import { getOptimizedGasPrice, NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
-import { PROFIT_CONFIG, ZERO_ADDRESS } from '../../utils/constants.js';
-import { getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient } from './config.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS, BLOCKRAZOR_BUILDER_EOA } from '../../utils/constants.js';
+import { getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient, getBribeAmount } from './config.js';
 import { getErc20DecimalsMerkle as _getErc20DecimalsMerkle, generateHopWallets as _generateHopWallets, normalizeAmounts as _normalizeAmounts, batchGetBalances as _batchGetBalances, calculateGasLimit as _calculateGasLimit, isNativeTokenAddress as _isNativeTokenAddress } from './internal.js';
 /**
  * 根据用户类型获取利润费率（bps）
@@ -27,8 +27,8 @@ function calculateProfit(amount, userType) {
 import { quote, QUOTE_CONFIG } from '../../utils/quote-helpers.js';
 import { Helper3 } from '../helper3.js';
 import { FlapPortal } from '../../flap/portal.js';
-/** 最低利润（Wei）：无法获取报价时使用，0.0001 BNB */
-const MIN_PROFIT_WEI = 100000000000000n; // 0.0001 BNB = 10^14 wei
+/** 最低利润（Wei）：报价成功但金额过低时的阈值，0.00000001 BNB */
+const MIN_PROFIT_WEI = 10000000000n; // 0.00000001 BNB = 10^10 wei（降低阈值以支持小额利润多跳）
 /** 链 ID → 链名称 映射 */
 const CHAIN_ID_TO_NAME = {
     56: 'BSC',
@@ -261,7 +261,10 @@ export async function disperseWithBundleMerkle(params) {
     const nonceManager = new NonceManager(provider);
     if (!preparedHops) {
         // ========== 无多跳：直接批量转账 ==========
-        const extraTxCount = extractProfit ? 1 : 0;
+        // ✅ BSC 链贿赂支持
+        const bribeAmount = chainIdNum === 56 ? getBribeAmount(config) : 0n;
+        const needBribeTx = bribeAmount > 0n;
+        const extraTxCount = (extractProfit ? 1 : 0) + (needBribeTx ? 1 : 0);
         const totalTxCount = recipients.length + extraTxCount;
         // ✅ 优化：并行获取 gasPrice 和 nonces
         const [gasPrice, nonces] = await Promise.all([
@@ -270,6 +273,21 @@ export async function disperseWithBundleMerkle(params) {
                 ? Promise.resolve(Array.from({ length: totalTxCount }, (_, i) => startNonce + i))
                 : nonceManager.getNextNonceBatch(mainWallet, totalTxCount)
         ]);
+        // ✅ 贿赂交易放在最前面
+        let nonceOffset = 0;
+        if (needBribeTx) {
+            const bribeTx = await mainWallet.signTransaction({
+                to: BLOCKRAZOR_BUILDER_EOA,
+                value: bribeAmount,
+                nonce: nonces[nonceOffset++],
+                gasPrice,
+                gasLimit: 21000n,
+                chainId: chainIdNum,
+                type: txType
+            });
+            signedTxs.push(bribeTx);
+            console.log(`[disperse] 贿赂交易已添加: ${ethers.formatEther(bribeAmount)} BNB`);
+        }
         if (isNative) {
             // ✅ 原生币：先计算所有金额和利润（同步），再并行签名
             const txDataList = recipients.map((to, i) => {
@@ -281,7 +299,7 @@ export async function disperseWithBundleMerkle(params) {
                     actualAmount = remaining;
                     totalProfit += profit;
                 }
-                return { to, value: actualAmount, nonce: nonces[i] };
+                return { to, value: actualAmount, nonce: nonces[nonceOffset + i] };
             });
             // ✅ 并行签名所有交易
             const txPromises = txDataList.map(({ to, value, nonce }) => mainWallet.signTransaction({
@@ -305,7 +323,7 @@ export async function disperseWithBundleMerkle(params) {
                     gasPrice,
                     chainId: chainIdNum,
                     txType,
-                    startNonce: nonces[recipients.length]
+                    startNonce: nonces[nonceOffset + recipients.length]
                 });
                 signedTxs.push(...profitHopResult.signedTransactions);
                 profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -355,7 +373,7 @@ export async function disperseWithBundleMerkle(params) {
                 }
                 // 报价成功：全额分发 ERC20（不扣 ERC20）
                 const data = iface.encodeFunctionData('transfer', [to, actualAmount]);
-                return { data, nonce: nonces[i] };
+                return { data, nonce: nonces[nonceOffset + i] };
             });
             // ✅ 并行签名所有交易
             const txPromises = txDataList.map(({ data, nonce }) => mainWallet.signTransaction({
@@ -369,7 +387,7 @@ export async function disperseWithBundleMerkle(params) {
                 type: txType
             }));
             signedTxs.push(...(await Promise.all(txPromises)));
-            // ✅ 利润多跳转账（强制 2 跳中转）- 仅在报价成功时扣 OKB
+            // ✅ 利润多跳转账（强制 2 跳中转）- 仅在报价成功时扣 OKB/BNB
             if (extractProfit && profitIsNative && nativeProfitAmount > 0n) {
                 const profitHopResult = await buildProfitHopTransactions({
                     provider,
@@ -380,15 +398,19 @@ export async function disperseWithBundleMerkle(params) {
                     gasPrice,
                     chainId: chainIdNum,
                     txType,
-                    startNonce: nonces[recipients.length]
+                    startNonce: nonces[nonceOffset + recipients.length]
                 });
                 signedTxs.push(...profitHopResult.signedTransactions);
                 profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
+                console.log(`[disperse ERC20] 利润多跳已添加: ${ethers.formatEther(nativeProfitAmount)} 原生币`);
             }
         }
     }
     else {
         // ========== 有多跳：构建跳转链 ==========
+        // ✅ BSC 链贿赂支持
+        const bribeAmountHop = chainIdNum === 56 ? getBribeAmount(config) : 0n;
+        const needBribeTxHop = bribeAmountHop > 0n;
         // ✅ 优化：并行获取 gasPrice 和 decimals
         const [gasPrice, decimals] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
@@ -409,6 +431,9 @@ export async function disperseWithBundleMerkle(params) {
         // - 原生代币多跳：主钱包只需要 1 个 nonce（一笔转账包含后续所有 gas）
         // - ERC20 多跳：主钱包需要 2 个 nonce（转 gas + 转 ERC20）
         let mainWalletNonceCount = 0;
+        // 贿赂交易需要 1 个额外的 nonce
+        if (needBribeTxHop)
+            mainWalletNonceCount += 1;
         for (let i = 0; i < recipients.length; i++) {
             const hopChain = preparedHops[i];
             if (hopChain.length === 0) {
@@ -430,6 +455,20 @@ export async function disperseWithBundleMerkle(params) {
             ? Array.from({ length: mainWalletNonceCount }, (_, i) => startNonce + i)
             : await nonceManager.getNextNonceBatch(mainWallet, mainWalletNonceCount);
         let mainNonceIdx = 0;
+        // ✅ 贿赂交易放在最前面（多跳场景）
+        if (needBribeTxHop) {
+            const bribeTx = await mainWallet.signTransaction({
+                to: BLOCKRAZOR_BUILDER_EOA,
+                value: bribeAmountHop,
+                nonce: allMainNonces[mainNonceIdx++],
+                gasPrice,
+                gasLimit: 21000n,
+                chainId: chainIdNum,
+                type: txType
+            });
+            signedTxs.push(bribeTx);
+            console.log(`[disperse with hops] 贿赂交易已添加: ${ethers.formatEther(bribeAmountHop)} BNB`);
+        }
         const txsToSign = [];
         // ✅ ERC20 多跳：累计代币利润，最后统一转换为原生代币
         let totalTokenProfit = 0n;
@@ -727,6 +766,28 @@ export async function sweepWithBundleMerkle(params) {
     let totalProfit = 0n;
     let totalAmountBeforeProfit = 0n;
     let profitHopWallets; // ✅ 收集利润多跳钱包
+    // ✅ BSC 链贿赂支持（由 targetWallet 支付，如果提供了 targetPrivateKey）
+    const bribeAmount = chainIdNum === 56 ? getBribeAmount(config) : 0n;
+    const needBribeTx = bribeAmount > 0n && targetWallet !== null;
+    const bribeSignedTx = [];
+    // ✅ 贿赂交易放在最前面（由 targetWallet 签名）
+    if (needBribeTx && targetWallet) {
+        const [bribeGasPrice, bribeNonce] = await Promise.all([
+            getOptimizedGasPrice(provider, getGasPriceConfig(config)),
+            provider.getTransactionCount(targetWallet.address)
+        ]);
+        const bribeTx = await targetWallet.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice: bribeGasPrice,
+            gasLimit: 21000n,
+            chainId: chainIdNum,
+            type: txType
+        });
+        bribeSignedTx.push(bribeTx);
+        console.log(`[sweep] 贿赂交易已添加: ${ethers.formatEther(bribeAmount)} BNB (by targetWallet)`);
+    }
     if (!preparedHops) {
         // ========== 无多跳：直接批量归集 ==========
         const wallets = actualKeys.map(pk => new Wallet(pk, provider));
@@ -1403,9 +1464,9 @@ export async function sweepWithBundleMerkle(params) {
             }
         }
     }
-    // ✅ 简化返回：只返回签名交易、多跳钱包和元数据
+    // ✅ 简化返回：贿赂交易放在最前面，然后是签名交易、多跳钱包和元数据
     return {
-        signedTransactions: signedTxs,
+        signedTransactions: [...bribeSignedTx, ...signedTxs],
         hopWallets: preparedHops || undefined,
         profitHopWallets, // ✅ 返回利润多跳钱包
         metadata: extractProfit ? {
@@ -1414,7 +1475,9 @@ export async function sweepWithBundleMerkle(params) {
             profitRecipient: getProfitRecipient(),
             sourceCount: actualKeys.length,
             isNative,
-            tokenAddress: isNative ? undefined : tokenAddress
+            tokenAddress: isNative ? undefined : tokenAddress,
+            hasBribeTx: bribeSignedTx.length > 0, // ✅ 标记是否有贿赂交易
+            bribeAmount: bribeSignedTx.length > 0 ? ethers.formatEther(bribeAmount) : undefined
         } : undefined
     };
 }
@@ -1498,6 +1561,10 @@ export async function pairwiseTransferWithBundleMerkle(params) {
     if (!isNative && extractProfit && totalTokenProfit > 0n) {
         totalProfitNative = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
     }
+    // ✅ BSC 链贿赂支持（由第一个 sender 支付）
+    const bribeAmount = chainIdNum === 56 ? getBribeAmount(config) : 0n;
+    const needBribeTx = bribeAmount > 0n;
+    const bribeSignedTx = [];
     // 计算每个 sender 需要的 nonce 数量（聚合到地址）
     const senderWallets = senderPrivateKeys.map(pk => new Wallet(pk, provider));
     const senderAddrLowerList = senderWallets.map(w => w.address.toLowerCase());
@@ -1517,6 +1584,12 @@ export async function pairwiseTransferWithBundleMerkle(params) {
         else
             nonceNeedBySender.set(addrLower, { wallet: senderWallets[i], count: perPairTxCount });
     }
+    // ✅ 贿赂交易需要 1 个额外的 nonce
+    if (needBribeTx) {
+        const cur = nonceNeedBySender.get(firstSenderAddrLower);
+        if (cur)
+            cur.count += 1;
+    }
     if (extractProfit && totalProfitNative > 0n) {
         const cur = nonceNeedBySender.get(firstSenderAddrLower);
         if (cur)
@@ -1671,6 +1744,22 @@ export async function pairwiseTransferWithBundleMerkle(params) {
             }
         }
     }
+    // ✅ 贿赂交易签名（放在最前面）
+    if (needBribeTx) {
+        const firstSenderWallet = senderWallets[0];
+        const bribeNonce = popNonce(firstSenderAddrLower);
+        const bribeTx = await firstSenderWallet.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: chainIdNum,
+            type: txType
+        });
+        bribeSignedTx.push(bribeTx);
+        console.log(`[pairwise] 贿赂交易已添加: ${ethers.formatEther(bribeAmount)} BNB`);
+    }
     const signedTxs = await Promise.all(txsToSign.map(({ wallet, tx }) => wallet.signTransaction(tx)));
     // 利润多跳（固定 2 hop）
     let profitHopWallets;
@@ -1692,7 +1781,7 @@ export async function pairwiseTransferWithBundleMerkle(params) {
         profitHopWallets = profitHopResult.hopWallets;
     }
     return {
-        signedTransactions: signedTxs,
+        signedTransactions: [...bribeSignedTx, ...signedTxs], // ✅ 贿赂交易放在最前面
         hopWallets: preparedHops || undefined,
         profitHopWallets,
         metadata: extractProfit ? {
@@ -1702,6 +1791,8 @@ export async function pairwiseTransferWithBundleMerkle(params) {
             totalAmount: isNative ? ethers.formatEther(totalAmountBeforeProfit) : ethers.formatUnits(totalAmountBeforeProfit, decimals),
             profitAmount: ethers.formatEther(totalProfitNative),
             profitRecipient: getProfitRecipient(),
+            hasBribeTx: bribeSignedTx.length > 0, // ✅ 标记是否有贿赂交易
+            bribeAmount: bribeSignedTx.length > 0 ? ethers.formatEther(bribeAmount) : undefined
         } : undefined
     };
 }

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

@@ -305,10 +305,7 @@ export async function flapBundleCreateToDex(params) {
         // V4: 提供了 dexId 或 lpFeeProfile（支持 DEX 选择和 LP 费率配置）
         // V3: 提供了 extensionID（支持扩展数据）
         // V2: 默认
-        console.log('[create-to-dex] 🔍 taxV2Config:', params.taxV2Config);
-        console.log('[create-to-dex] 🔍 taxRate:', params.taxRate);
         const useV5 = params.taxV2Config !== undefined && (params.taxRate ?? 0) > 0;
-        console.log('[create-to-dex] 🔍 useV5:', useV5);
         const useV4 = !useV5 && (params.dexId !== undefined || params.lpFeeProfile !== undefined);
         const useV3 = !useV5 && !useV4 && !!params.extensionID;
         let createUnsigned;

package/package.json

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