four-flap-meme-sdk 1.3.94 → 1.3.95

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

@@ -7,8 +7,10 @@ import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { ADDRESSES } from '../../utils/constants.js';
 import { TM_ABI, HELPER3_ABI, TM_ADDRESS } from './swap-internal.js';
-import { getTxType, getGasPriceConfig, getProfitRecipient, getProfitRateBps } from './config.js';
+import { getTxType, getGasPriceConfig, getProfitRecipient, getProfitRateBps, getBribeAmount } from './config.js';
 import { trySell } from '../tm.js';
+// ✅ BlockRazor Builder EOA 地址（用于贿赂）
+const BLOCKRAZOR_BUILDER_EOA = '0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20';
 /**
  * 获取 Gas Limit（支持 FourAnyConfig）
  */
@@ -82,14 +84,19 @@ export async function fourBundleBuyFirstMerkle(params) {
     // ✅ 优化：第三批并行 - trySell、构建交易、获取 nonces
     const tmBuyer = new Contract(TM_ADDRESS, TM_ABI, buyer);
     const tmSeller = new Contract(TM_ADDRESS, TM_ABI, seller);
-    const slippageBps = config.slippageBps ?? 100;
-    const minBuyAmount = (estimatedTokenAmount * BigInt(10000 - slippageBps)) / 10000n;
+    // ✅ 已移除滑点保护：minBuyAmount 固定为 0
+    const minBuyAmount = 0n;
     // 预先规划 nonces
     const extractProfit = true;
     const profitRateBps = getProfitRateBps();
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
     // 计算需要的 nonce 数量
     let buyerNonceCount = 1; // 买入交易
     let sellerNonceCount = 1; // 卖出交易
+    if (needBribeTx)
+        sellerNonceCount++; // 贿赂交易（由卖方发送）
     if (needApproval)
         sellerNonceCount++; // 授权交易
     if (extractProfit)
@@ -121,7 +128,8 @@ export async function fourBundleBuyFirstMerkle(params) {
     ]);
     const { buyerNonces, sellerNonces } = noncesResult;
     const estimatedSellFunds = sellResult.funds;
-    const minSellFunds = (estimatedSellFunds * BigInt(10000 - slippageBps)) / 10000n;
+    // ✅ 已移除滑点保护：minSellFunds 固定为 0
+    const minSellFunds = 0n;
     const profitAmount = extractProfit ? (estimatedSellFunds * BigInt(profitRateBps)) / 10000n : 0n;
     // 更新卖出交易的 minSellFunds
     sellUnsigned.data = tmSeller.interface.encodeFunctionData('sellToken', [
@@ -130,10 +138,13 @@ export async function fourBundleBuyFirstMerkle(params) {
     // 分配 nonces
     let buyerNonce;
     let sellerNonce;
+    let bribeNonce;
     let approvalNonce;
     let profitNonce;
     if (sameAddress) {
         let idx = 0;
+        if (needBribeTx)
+            bribeNonce = sellerNonces[idx++];
         if (needApproval)
             approvalNonce = sellerNonces[idx++];
         buyerNonce = sellerNonces[idx++];
@@ -144,6 +155,8 @@ export async function fourBundleBuyFirstMerkle(params) {
     else {
         buyerNonce = buyerNonces[0];
         let idx = 0;
+        if (needBribeTx)
+            bribeNonce = sellerNonces[idx++];
         if (needApproval)
             approvalNonce = sellerNonces[idx++];
         sellerNonce = sellerNonces[idx++];
@@ -152,6 +165,19 @@ export async function fourBundleBuyFirstMerkle(params) {
     }
     // ✅ 并行签名所有交易
     const signPromises = [];
+    // ✅ 贿赂交易放在首位
+    let bribeTx = null;
+    if (needBribeTx && bribeNonce !== undefined) {
+        signPromises.push(seller.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: chainIdNum,
+            type: txType
+        }));
+    }
     // 授权交易
     let approvalTx = null;
     if (needApproval && approvalNonce !== undefined) {
@@ -190,7 +216,7 @@ export async function fourBundleBuyFirstMerkle(params) {
         type: txType,
         value: 0n // ✅ 卖出交易不发送原生代币
     }));
-    // 利润交易
+    // ✅ 利润交易放在末尾
     let profitTx = null;
     if (extractProfit && profitAmount > 0n && profitNonce !== undefined) {
         signPromises.push(seller.signTransaction({
@@ -206,6 +232,8 @@ export async function fourBundleBuyFirstMerkle(params) {
     const signedTxs = await Promise.all(signPromises);
     // 解析签名结果
     let idx = 0;
+    if (needBribeTx)
+        bribeTx = signedTxs[idx++];
     if (needApproval)
         approvalTx = signedTxs[idx++];
     const signedBuy = signedTxs[idx++];
@@ -213,8 +241,10 @@ export async function fourBundleBuyFirstMerkle(params) {
     if (extractProfit && profitAmount > 0n)
         profitTx = signedTxs[idx];
     nonceManager.clearTemp();
-    // 组装交易列表
+    // ✅ 组装交易列表：贿赂 → 授权 → 买入 → 卖出 → 利润
     const allTransactions = [];
+    if (bribeTx)
+        allTransactions.push(bribeTx);
     if (approvalTx)
         allTransactions.push(approvalTx);
     allTransactions.push(signedBuy, signedSell);

package/dist/contracts/tm-bundle-merkle/swap.d.ts

@@ -29,7 +29,6 @@ export interface FourBundleSwapSignParams {
     sellPercentage?: number;
     buyerPrivateKey: string;
     tokenAddress: string;
-    slippageTolerance?: number;
     config: FourSwapSignConfig;
 }
 export interface FourBundleSwapParams {
@@ -38,7 +37,6 @@ export interface FourBundleSwapParams {
     sellPercentage?: number;
     buyerPrivateKey: string;
     tokenAddress: string;
-    slippageTolerance?: number;
     config: FourSwapConfig;
 }
 /**
@@ -69,7 +67,6 @@ export interface FourBatchSwapSignParams {
     buyerPrivateKeys: string[];
     buyerRatios?: number[];
     tokenAddress: string;
-    slippageTolerance?: number;
     config: FourSwapSignConfig;
 }
 /**

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

@@ -8,11 +8,14 @@ import { calculateSellAmount } from '../../utils/swap-helpers.js';
 import { NonceManager, getOptimizedGasPrice, getGasLimit, getGasPriceConfig, getTxType } from '../../utils/bundle-helpers.js';
 import { ADDRESSES, PROFIT_CONFIG } from '../../utils/constants.js';
 import { TM_ABI, HELPER3_ABI, TM_ADDRESS } from './swap-internal.js';
+import { getBribeAmount } from './config.js';
+// ✅ BlockRazor Builder EOA 地址（用于贿赂）
+const BLOCKRAZOR_BUILDER_EOA = '0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20';
 /**
  * Four内盘捆绑换手
  */
 export async function fourBundleSwapMerkle(params) {
-    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKey, tokenAddress, slippageTolerance = 0.5, config } = params;
+    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKey, tokenAddress, config } = params;
     const chainIdNum = config.chainId ?? 56;
     const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
         chainId: chainIdNum,
@@ -65,11 +68,16 @@ export async function fourBundleSwapMerkle(params) {
     const profitAmount = extractProfit && sellerWillGetBNB > 0n
         ? (sellerWillGetBNB * BigInt(profitRateBps)) / 10000n
         : 0n;
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
     // ✅ 优化：第三批并行 - 构建交易、获取 nonces
     const tmSeller = new Contract(TM_ADDRESS, TM_ABI, seller);
     const tmBuyer = new Contract(TM_ADDRESS, TM_ABI, buyer);
     // 计算需要的 nonce 数量
     let sellerNonceCount = 1; // 卖出交易
+    if (needBribeTx)
+        sellerNonceCount++; // 贿赂交易
     if (needApproval)
         sellerNonceCount++; // 授权交易
     if (extractProfit)
@@ -96,13 +104,28 @@ export async function fourBundleSwapMerkle(params) {
     const { sellerNonces, buyerNonce } = noncesResult;
     // 分配 nonces
     let idx = 0;
+    let bribeNonce;
     let approvalNonce;
+    if (needBribeTx)
+        bribeNonce = sellerNonces[idx++];
     if (needApproval)
         approvalNonce = sellerNonces[idx++];
     const sellerNonce = sellerNonces[idx++];
     const profitNonce = extractProfit ? sellerNonces[idx] : undefined;
     // ✅ 并行签名所有交易
     const signPromises = [];
+    // ✅ 贿赂交易放在首位
+    if (needBribeTx && bribeNonce !== undefined) {
+        signPromises.push(seller.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: chainIdNum,
+            type: txType
+        }));
+    }
     // 授权交易
     if (needApproval && approvalNonce !== undefined) {
         const approveInterface = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
@@ -137,7 +160,7 @@ export async function fourBundleSwapMerkle(params) {
         type: txType,
         value: buyerFunds
     }));
-    // 利润交易
+    // ✅ 利润交易放在末尾
     if (extractProfit && profitAmount > 0n && profitNonce !== undefined) {
         signPromises.push(seller.signTransaction({
             to: PROFIT_CONFIG.RECIPIENT,
@@ -152,15 +175,20 @@ export async function fourBundleSwapMerkle(params) {
     const signedTxs = await Promise.all(signPromises);
     // 解析签名结果
     let signIdx = 0;
+    let bribeTx = null;
     let approvalTx = null;
+    if (needBribeTx)
+        bribeTx = signedTxs[signIdx++];
     if (needApproval)
         approvalTx = signedTxs[signIdx++];
     const signedSell = signedTxs[signIdx++];
     const signedBuy = signedTxs[signIdx++];
     const profitTx = extractProfit && profitAmount > 0n ? signedTxs[signIdx] : null;
     nonceManager.clearTemp();
-    // 组装交易列表
+    // ✅ 组装交易列表：贿赂 → 授权 → 卖出 → 买入 → 利润
     const allTransactions = [];
+    if (bribeTx)
+        allTransactions.push(bribeTx);
     if (approvalTx)
         allTransactions.push(approvalTx);
     allTransactions.push(signedSell, signedBuy);
@@ -185,7 +213,7 @@ export async function fourBundleSwapMerkle(params) {
  * 限制：最多 24 个买方（服务器限制 25 笔交易，包含 1 笔利润交易）
  */
 export async function fourBatchSwapMerkle(params) {
-    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKeys, tokenAddress, slippageTolerance = 0.5, config } = params;
+    const { sellerPrivateKey, sellAmount, sellPercentage, buyerPrivateKeys, tokenAddress, config } = params;
     // ✅ 校验买方数量（最多 24 个）
     const MAX_BUYERS = 24;
     if (buyerPrivateKeys.length === 0) {
@@ -258,6 +286,9 @@ export async function fourBatchSwapMerkle(params) {
     const profitAmount = totalBuyerFunds > 0n
         ? (totalBuyerFunds * BigInt(profitRateBps)) / 10000n
         : 0n;
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
     // ✅ 并行构建所有交易
     const tmSeller = new Contract(TM_ADDRESS, TM_ABI, seller);
     const [sellUnsigned, ...buyUnsignedList] = await Promise.all([
@@ -273,6 +304,8 @@ export async function fourBatchSwapMerkle(params) {
     // ✅ 计算 nonce
     // seller 需要的 nonce 数量
     let sellerNonceCount = 1; // 卖出交易
+    if (needBribeTx)
+        sellerNonceCount++; // 贿赂交易
     if (needApproval)
         sellerNonceCount++; // 授权交易
     sellerNonceCount++; // 利润交易
@@ -282,7 +315,10 @@ export async function fourBatchSwapMerkle(params) {
     // 分配 seller nonces
     const sellerNonces = Array.from({ length: sellerNonceCount }, (_, i) => initialNonces[0] + i);
     let idx = 0;
+    let bribeNonce;
     let approvalNonce;
+    if (needBribeTx)
+        bribeNonce = sellerNonces[idx++];
     if (needApproval)
         approvalNonce = sellerNonces[idx++];
     const sellerNonce = sellerNonces[idx++];
@@ -291,6 +327,18 @@ export async function fourBatchSwapMerkle(params) {
     const buyerNonces = initialNonces.slice(1);
     // ✅ 并行签名所有交易
     const signPromises = [];
+    // ✅ 贿赂交易放在首位
+    if (needBribeTx && bribeNonce !== undefined) {
+        signPromises.push(seller.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId: chainIdNum,
+            type: txType
+        }));
+    }
     // 授权交易
     if (needApproval && approvalNonce !== undefined) {
         const approveInterface = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
@@ -329,7 +377,7 @@ export async function fourBatchSwapMerkle(params) {
             value: buyAmountsWei[i]
         }));
     });
-    // 利润交易
+    // ✅ 利润交易放在末尾
     if (profitAmount > 0n) {
         signPromises.push(seller.signTransaction({
             to: PROFIT_CONFIG.RECIPIENT,
@@ -344,7 +392,10 @@ export async function fourBatchSwapMerkle(params) {
     const signedTxs = await Promise.all(signPromises);
     // 解析签名结果
     let signIdx = 0;
+    let bribeTx = null;
     let approvalTx = null;
+    if (needBribeTx)
+        bribeTx = signedTxs[signIdx++];
     if (needApproval)
         approvalTx = signedTxs[signIdx++];
     const signedSell = signedTxs[signIdx++];
@@ -352,8 +403,10 @@ export async function fourBatchSwapMerkle(params) {
     signIdx += buyers.length;
     const profitTx = profitAmount > 0n ? signedTxs[signIdx] : null;
     nonceManager.clearTemp();
-    // ✅ 按顺序组装交易数组
+    // ✅ 按顺序组装交易数组：贿赂 → 授权 → 卖出 → 买入 → 利润
     const signedTransactions = [];
+    if (bribeTx)
+        signedTransactions.push(bribeTx);
     if (approvalTx)
         signedTransactions.push(approvalTx);
     signedTransactions.push(signedSell);

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

@@ -153,8 +153,8 @@ export async function disperseWithBundleMerkle(params) {
             signedTxs.push(...(await Promise.all(txPromises)));
         }
         else {
-            // ✅ ERC20：并行获取 decimals
-            const decimals = tokenDecimals ?? (await _getErc20DecimalsMerkle(provider, tokenAddress));
+            // ✅ ERC20：并行获取 decimals（传入 chainIdNum 避免 NETWORK_ERROR）
+            const decimals = tokenDecimals ?? (await _getErc20DecimalsMerkle(provider, tokenAddress, chainIdNum));
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
             // 先计算所有金额和利润（同步）- ERC20 利润以代币计
             let totalTokenProfit = 0n;
@@ -207,7 +207,7 @@ export async function disperseWithBundleMerkle(params) {
         // ✅ 优化：并行获取 gasPrice 和 decimals
         const [gasPrice, decimals] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-            isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress))
+            isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress, chainIdNum))
         ]);
         const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
         const gasFeePerHop = finalGasLimit * gasPrice;
@@ -608,10 +608,10 @@ export async function sweepWithBundleMerkle(params) {
             }
         }
         else {
-            // ✅ ERC20：并行获取 gasPrice、decimals、余额
+            // ✅ ERC20：并行获取 gasPrice、decimals、余额（传入 chainIdNum 避免 NETWORK_ERROR）
             const [gasPrice, decimals, balances, bnbBalances] = await Promise.all([
                 getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-                Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress)),
+                Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress, chainIdNum)),
                 _batchGetBalances(provider, addresses, tokenAddress),
                 config.checkBnbForErc20NoHop ? _batchGetBalances(provider, addresses) : Promise.resolve([])
             ]);
@@ -760,10 +760,10 @@ export async function sweepWithBundleMerkle(params) {
             }
         }
         const sourceAddresses = sourceWallets.map(w => w.address);
-        // ✅ 优化：并行获取 gasPrice、decimals、余额
+        // ✅ 优化：并行获取 gasPrice、decimals、余额（传入 chainIdNum 避免 NETWORK_ERROR）
         const [gasPrice, decimals, balances, bnbBalances] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-            isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress)),
+            isNative ? Promise.resolve(18) : Promise.resolve(tokenDecimals ?? await _getErc20DecimalsMerkle(provider, tokenAddress, chainIdNum)),
             _batchGetBalances(provider, sourceAddresses, tokenAddress),
             isNative ? Promise.resolve([]) : _batchGetBalances(provider, sourceAddresses)
         ]);

package/dist/flap/portal-bundle-merkle/config.d.ts

@@ -1,5 +1,6 @@
 import type { FlapBundleMerkleConfig, FlapSignConfig, FlapChainForMerkleBundle } from './types.js';
 export type { FlapBundleMerkleConfig, FlapSignConfig, FlapChainForMerkleBundle };
+export declare const BLOCKRAZOR_BUILDER_EOA = "0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20";
 export type FlapAnyConfig = FlapBundleMerkleConfig | FlapSignConfig;
 export declare const CHAIN_ID_MAP: Record<FlapChainForMerkleBundle, number>;
 export declare const MERKLE_SUPPORTED_CHAIN_IDS: readonly [56, 1];
@@ -70,3 +71,10 @@ export declare function calculateBatchProfit(amounts: bigint[], config?: FlapAny
     totalProfit: bigint;
     remainingAmounts: bigint[];
 };
+/**
+ * 获取 BlockRazor 贿赂金额（wei）
+ * ✅ 用于提高 bundle 打包优先级
+ * @param config 配置
+ * @returns 贿赂金额（wei），如果未配置则返回 0n
+ */
+export declare function getBribeAmount(config?: FlapAnyConfig): bigint;

package/dist/flap/portal-bundle-merkle/config.js

@@ -1,5 +1,8 @@
 import { ethers } from 'ethers';
 import { PROFIT_CONFIG } from '../../utils/constants.js';
+// ✅ BlockRazor Builder EOA 地址（用于贿赂）
+// 参考文档: https://blockrazor.gitbook.io/blockrazor/bsc/block-builder/send-bundle
+export const BLOCKRAZOR_BUILDER_EOA = '0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20';
 // ✅ Chain ID 映射
 // 注意：Merkle 捆绑服务目前只支持 BSC (56) 和 ETH (1)
 // 其他链仅用于非捆绑的签名交易
@@ -120,3 +123,17 @@ export function calculateBatchProfit(amounts, config) {
     }
     return { totalProfit, remainingAmounts };
 }
+/**
+ * 获取 BlockRazor 贿赂金额（wei）
+ * ✅ 用于提高 bundle 打包优先级
+ * @param config 配置
+ * @returns 贿赂金额（wei），如果未配置则返回 0n
+ */
+export function getBribeAmount(config) {
+    if (!config)
+        return 0n;
+    const bribeAmount = config.bribeAmount;
+    if (!bribeAmount || bribeAmount <= 0)
+        return 0n;
+    return ethers.parseEther(String(bribeAmount));
+}