four-flap-meme-sdk 1.4.24 → 1.4.26

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

@@ -2,8 +2,8 @@ import { ethers, Wallet } from 'ethers';
 import { MerkleClient } from '../../clients/merkle.js';
 import { getOptimizedGasPrice } 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';
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
 const DEFAULT_GAS_LIMIT = 800000;
 /**
  * 私有购买（单笔）（Merkle 版本）

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

@@ -6,36 +6,17 @@
 import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
-import { PROFIT_CONFIG } from '../../utils/constants.js';
-import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA } from './config.js';
-// Portal ABI
-const PORTAL_ABI = [
-    'function swapExactInput((address inputToken, address outputToken, uint256 inputAmount, uint256 minOutputAmount, bytes permitData)) payable returns (uint256)',
-    'function quoteExactInput((address inputToken, address outputToken, uint256 inputAmount)) view returns (uint256)'
-];
-const ERC20_BALANCE_ABI = [
-    'function balanceOf(address) view returns (uint256)',
-    'function decimals() view returns (uint8)'
-];
-const ERC20_ALLOWANCE_ABI = [
-    'function allowance(address owner,address spender) view returns (uint256)',
-    'function approve(address spender,uint256 amount) returns (bool)',
-    'function decimals() view returns (uint8)'
-];
-const APPROVE_INTERFACE = new ethers.Interface([
-    'function approve(address,uint256) returns (bool)'
-]);
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-// ==================== ERC20 → 原生代币报价 ====================
-// BSC 链常量
-const BSC_PANCAKE_V2_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
-const BSC_WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-// ✅ Monad 链常量
+import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../utils/constants.js';
+import { ERC20_BALANCE_ABI, ERC20_ALLOWANCE_ABI, V2_ROUTER_QUOTE_ABI } from '../../abis/common.js';
+import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
+// ✅ ABI 别名
+const APPROVE_INTERFACE = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
+// ==================== 链常量 ====================
+const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
+const BSC_WBNB = ADDRESSES.BSC.WBNB;
 const MONAD_PANCAKE_V2_ROUTER = '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9';
-const MONAD_WMON = '0x3bd359c1119da7da1d913d1c4d2b7c461115433a';
-const ROUTER_ABI = [
-    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
-];
+const MONAD_WMON = ADDRESSES.MONAD.WMON;
+const ROUTER_ABI = V2_ROUTER_QUOTE_ABI;
 /**
  * 获取 ERC20 代币 → 原生代币的报价
  * @param provider - Provider 实例
@@ -267,7 +248,8 @@ export async function flapBundleBuyFirstMerkle(params) {
         }
     };
 }
-const ERC20_BALANCE_OF_ABI = ['function balanceOf(address) view returns (uint256)'];
+// ✅ 使用公共模块中的 ERC20_BALANCE_ABI
+const ERC20_BALANCE_OF_ABI = ERC20_BALANCE_ABI;
 async function calculateBuyerFunds({ buyer, buyerFunds, buyerFundsPercentage, reserveGasEth, nativeToken, useNativeToken = true, quoteToken, quoteTokenDecimals = 18, provider }) {
     const reserveGas = ethers.parseEther((reserveGasEth || 0.0005).toString());
     // ✅ 根据是否使用原生代币获取不同的余额

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

@@ -7,41 +7,28 @@ import { ethers, Contract, Wallet } from 'ethers';
 import { calculateSellAmount } from '../../utils/swap-helpers.js';
 import { NonceManager, getOptimizedGasPrice } from '../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
-import { PROFIT_CONFIG } from '../../utils/constants.js';
-import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA } from './config.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';
+import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
 /**
- * 获取 Gas Limit（支持 FlapAnyConfig）
+ * 获取 Gas Limit
  */
 function getGasLimit(config, defaultGas = 500000) {
     if (config.gasLimit !== undefined) {
         return typeof config.gasLimit === 'bigint' ? config.gasLimit : BigInt(config.gasLimit);
     }
     const multiplier = config.gasLimitMultiplier ?? 1.0;
-    const calculatedGas = Math.ceil(defaultGas * multiplier);
-    return BigInt(calculatedGas);
+    return BigInt(Math.ceil(defaultGas * multiplier));
 }
-// Portal ABI（使用 swapExactInput 统一接口 + quoteExactInput 报价）
-const PORTAL_ABI = [
-    'function swapExactInput((address inputToken, address outputToken, uint256 inputAmount, uint256 minOutputAmount, bytes permitData)) payable returns (uint256)',
-    'function quoteExactInput((address inputToken, address outputToken, uint256 inputAmount)) view returns (uint256)'
-];
-const ERC20_ALLOWANCE_ABI = [
-    'function allowance(address,address) view returns (uint256)',
-    'function approve(address,uint256) returns (bool)',
-    'function decimals() view returns (uint8)'
-];
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+// ✅ ABI 别名
+const ROUTER_ABI = V2_ROUTER_QUOTE_ABI;
+const ERC20_BALANCE_OF_ABI = ERC20_BALANCE_ABI;
 const APPROVE_INTERFACE = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
-// ==================== ERC20 → 原生代币报价 ====================
-// BSC 链常量
-const BSC_PANCAKE_V2_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
-const BSC_WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-// ✅ Monad 链常量
+// ✅ 链常量
+const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
+const BSC_WBNB = ADDRESSES.BSC.WBNB;
 const MONAD_PANCAKE_V2_ROUTER = '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9';
-const MONAD_WMON = '0x3bd359c1119da7da1d913d1c4d2b7c461115433a';
-const ROUTER_ABI = [
-    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
-];
+const MONAD_WMON = ADDRESSES.MONAD.WMON;
 /**
  * 获取 ERC20 代币 → 原生代币的报价
  * @param provider - Provider 实例
@@ -341,7 +328,7 @@ async function quoteSellOutput({ portalAddress, tokenAddress, sellAmountWei, pro
         throw new Error(`卖出报价失败: ${err}`);
     }
 }
-const ERC20_BALANCE_OF_ABI = ['function balanceOf(address) view returns (uint256)'];
+// ✅ ERC20_BALANCE_OF_ABI 已在文件开头定义
 async function calculateBuyerNeed({ buyer, quotedNative, reserveGasEth, nativeToken, useNativeToken = true, quoteToken, quoteTokenDecimals = 18, provider }) {
     const reserveGas = ethers.parseEther((reserveGasEth || 0.0005).toString());
     // ✅ 根据是否使用原生代币获取不同的余额

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

@@ -203,6 +203,10 @@ export type PancakeProxyBatchBuyParams = {
     v3Fee?: number;
     v3LpAddresses?: string[];
     v3ExactTokenIn?: string;
+    /** V3 多跳：代币路径 [tokenIn, tokenMid1, ..., tokenOut] */
+    v3Tokens?: string[];
+    /** V3 多跳：费率路径 [fee0, fee1, ...] - 长度 = v3Tokens.length - 1 */
+    v3Fees?: number[];
     minOutputAmounts?: (string | bigint)[];
     config: FlapBundleMerkleConfig;
 };
@@ -218,6 +222,10 @@ export type PancakeProxyBatchBuySignParams = {
     v3Fee?: number;
     v3LpAddresses?: string[];
     v3ExactTokenIn?: string;
+    /** V3 多跳：代币路径 [tokenIn, tokenMid1, ..., tokenOut] */
+    v3Tokens?: string[];
+    /** V3 多跳：费率路径 [fee0, fee1, ...] - 长度 = v3Tokens.length - 1 */
+    v3Fees?: number[];
     minOutputAmounts?: (string | bigint)[];
     config: FlapSignConfig;
     quoteToken?: string;
@@ -240,6 +248,10 @@ export type PancakeProxyBatchSellParams = {
     v3Fee?: number;
     v3LpAddresses?: string[];
     v3ExactTokenIn?: string;
+    /** V3 多跳：代币路径 [tokenIn, tokenMid1, ..., tokenOut] */
+    v3Tokens?: string[];
+    /** V3 多跳：费率路径 [fee0, fee1, ...] - 长度 = v3Tokens.length - 1 */
+    v3Fees?: number[];
     minOutputAmounts?: (string | bigint)[];
     config: FlapBundleMerkleConfig;
 };
@@ -255,13 +267,17 @@ export type PancakeProxyBatchSellSignParams = {
     v3Fee?: number;
     v3LpAddresses?: string[];
     v3ExactTokenIn?: string;
+    /** V3 多跳：代币路径 [tokenIn, tokenMid1, ..., tokenOut] */
+    v3Tokens?: string[];
+    /** V3 多跳：费率路径 [fee0, fee1, ...] - 长度 = v3Tokens.length - 1 */
+    v3Fees?: number[];
     minOutputAmounts?: (string | bigint)[];
     config: FlapSignConfig;
 };
 /** ✅ PancakeProxy 批量卖出结果（简化版） */
 export type PancakeProxyBatchSellResult = MerkleSignedResult;
 /**
- * PancakeSwapProxy 单个授权参数
+ * PancakeSwap Router 单个授权参数（官方合约）
  */
 export type PancakeProxyApprovalParams = {
     chain: 'BSC';
@@ -269,9 +285,11 @@ export type PancakeProxyApprovalParams = {
     tokenAddress: string;
     amount: string | 'max';
     rpcUrl: string;
+    /** 路由类型，用于确定授权目标（V2 或 V3 Router） */
+    routeType?: 'v2' | 'v3-single' | 'v3-multi';
 };
 /**
- * PancakeSwapProxy 批量授权参数（Merkle Bundle 版本）
+ * PancakeSwap Router 批量授权参数（官方合约）
  */
 export type PancakeProxyApprovalBatchParams = {
     chain: FlapChainForMerkleBundle;
@@ -279,6 +297,8 @@ export type PancakeProxyApprovalBatchParams = {
     tokenAddress: string;
     amounts: (string | 'max')[];
     config: FlapSignConfig;
+    /** 路由类型，用于确定授权目标（V2 或 V3 Router） */
+    routeType?: 'v2' | 'v3-single' | 'v3-multi';
 };
 /** ✅ PancakeProxy 批量授权结果 */
 export type PancakeProxyApprovalBatchResult = {

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

@@ -1,5 +1,7 @@
 import { ethers, Wallet, Contract } from 'ethers';
 import { getOptimizedGasPrice, NonceManager } from '../../utils/bundle-helpers.js';
+import { ADDRESSES } from '../../utils/constants.js';
+import { V2_ROUTER_QUOTE_ABI, MULTICALL3_ABI, ERC20_BALANCE_ABI } from '../../abis/common.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient } from './config.js';
 // ==================== 链配置 ====================
 const CHAIN_ID_MAP = {
@@ -7,19 +9,16 @@ const CHAIN_ID_MAP = {
     'MONAD': 143,
     'XLAYER': 196
 };
-// ==================== ERC20 → 原生代币报价 ====================
-// BSC 链常量
-const BSC_PANCAKE_V2_ROUTER = '0x10ED43C718714eb63d5aA57B78B54704E256024E';
-const BSC_WBNB = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-// Monad 链常量
+// ==================== 链常量 ====================
+// ✅ 使用公共模块
+const BSC_PANCAKE_V2_ROUTER = ADDRESSES.BSC.PancakeV2Router;
+const BSC_WBNB = ADDRESSES.BSC.WBNB;
 const MONAD_PANCAKE_V2_ROUTER = '0xb1bc24c34e88f7d43d5923034e3a14b24daacff9';
-const MONAD_WMON = '0x3bd359c1119da7da1d913d1c4d2b7c461115433a';
-// XLayer 链常量（PotatoSwap V2 Router）
+const MONAD_WMON = ADDRESSES.MONAD.WMON;
 const XLAYER_POTATOSWAP_V2_ROUTER = '0x881fb2f98c13d521009464e7d1cbf16e1b394e8e';
 const XLAYER_WOKB = '0xe538905cf8410324e03a5a23c1c177a474d59b2b';
-const ROUTER_ABI = [
-    'function getAmountsOut(uint amountIn, address[] calldata path) external view returns (uint[] memory amounts)'
-];
+const MULTICALL3_ADDRESS = ADDRESSES.BSC.Multicall3;
+const ROUTER_ABI = V2_ROUTER_QUOTE_ABI;
 /**
  * 获取 ERC20 代币 → 原生代币的报价
  */
@@ -101,13 +100,9 @@ async function batchGetBalances(provider, addresses, tokenAddress) {
         return Promise.all(addresses.map(addr => provider.getBalance(addr).catch(() => 0n)));
     }
     else {
-        const MULTICALL3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11';
-        const MULTICALL3_ABI = [
-            'function aggregate3(tuple(address target, bool allowFailure, bytes callData)[] calls) view returns (tuple(bool success, bytes returnData)[] returnData)'
-        ];
+        // ✅ 使用公共模块
         const multicall = new ethers.Contract(MULTICALL3_ADDRESS, MULTICALL3_ABI, provider);
-        const ERC20_ABI = ['function balanceOf(address) view returns (uint256)'];
-        const iface = new ethers.Interface(ERC20_ABI);
+        const iface = new ethers.Interface(ERC20_BALANCE_ABI);
         const calls = addresses.map(addr => ({
             target: tokenAddress,
             allowFailure: true,

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * as Abis from './abis/index.js';
-export { ADDRESSES, CHAIN } from './utils/constants.js';
+export { ERC20_ABI, ERC20_BALANCE_ABI, ERC20_ALLOWANCE_ABI, MULTICALL3_ABI, V2_ROUTER_ABI, V2_ROUTER_QUOTE_ABI, V3_ROUTER02_ABI, V3_ROUTER_LEGACY_ABI, V3_QUOTER_ABI, V2_FACTORY_ABI, V2_PAIR_ABI, V3_FACTORY_ABI, V3_POOL_ABI, FLAP_PORTAL_ABI, TM2_ABI, HELPER3_ABI, } from './abis/common.js';
+export { ADDRESSES, CHAIN, BLOCKRAZOR_BUILDER_EOA as BUILDER_EOA, ZERO_ADDRESS as COMMON_ZERO_ADDRESS, DEFAULT_DEADLINE_MINUTES, V3_FEE_TIERS as COMMON_V3_FEE_TIERS, } from './utils/constants.js';
 export { isExclusiveOnChain, isExclusiveOffChain } from './utils/mpcExclusive.js';
 export { ensureSellApprovalV1, checkSellApprovalV1, ensureSellApprovalV2, checkSellApprovalV2, ensureSellApproval, checkSellApproval, ensureFlapSellApproval, checkFlapSellApproval, ensureFlapSellApprovalBatch, checkFlapSellApprovalBatch, checkAllowance, approveToken, checkAllowanceBatch, approveTokenBatch, checkAllowanceRaw, approveTokenRaw, checkAllowanceBatchRaw, approveTokenBatchRaw, type EnsureAllowanceBatchItemResult, type ApproveTokenBatchParams, type ApproveTokenBatchRawParams, type ApproveTokenBatchResult, type ApproveTokenBatchSignResult } from './utils/erc20.js';
 export { parseFourError, type FourErrorCode } from './utils/errors.js';
@@ -21,7 +22,7 @@ export { createTokenFlow, type CreateTokenFlowInput, type CreateTokenFlowOutput
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, type BundleParams, type BundleStatus, type Club48Config } from './clients/club48.js';
 export { MerkleClient, createMerkleClient, type MerkleConfig, type BundleParams as MerkleBundleParams, type SendBundleOptions, type BundleResult, type TransactionResult } from './clients/merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, type BlockRazorConfig, type BlockRazorBundleParams, type SendBundleOptions as BlockRazorSendBundleOptions, type BundleResult as BlockRazorBundleResult, type TransactionResult as BlockRazorTransactionResult, type IncentiveTransactionParams } from './clients/blockrazor.js';
-export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, type GasPriceConfig, type GasEstimateConfig, type BuildTransactionOptions } from './utils/bundle-helpers.js';
+export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, getDeadline, encodeV3Path, decodeV3Path, getGasLimit, getGasPriceConfig, getTxType, getChainId, type GasPriceConfig, type GasEstimateConfig, type BuildTransactionOptions, type CommonBundleConfig, } from './utils/bundle-helpers.js';
 export { createTokenWithBundleBuy as fourCreateTokenWithBundleBuy, batchBuyWithBundle as fourBatchBuyWithBundle, batchSellWithBundle as fourBatchSellWithBundle, type FourBundleConfig, type FourCreateWithBundleBuyParams, type FourCreateWithBundleBuyResult, type FourBatchBuyParams, type FourBatchBuyResult, type FourBatchSellParams, type FourBatchSellResult } from './contracts/tm-bundle.js';
 export { createTokenWithBundleBuy as flapCreateTokenWithBundleBuy, batchBuyWithBundle as flapBatchBuyWithBundle, batchSellWithBundle as flapBatchSellWithBundle, type FlapBundleConfig, type FlapChainForBundle, type FlapCreateWithBundleBuyParams, type FlapCreateWithBundleBuyResult, type FlapBatchBuyParams, type FlapBatchBuyResult, type FlapBatchSellParams, type FlapBatchSellResult } from './flap/portal-bundle.js';
 export { fourPrivateBuy, fourPrivateSell, fourBatchPrivateBuy, fourBatchPrivateSell, type FourPrivateBuyParams, type FourPrivateSellParams, type FourBatchPrivateBuyParams, type FourBatchPrivateSellParams } from './contracts/tm-bundle.js';

package/dist/index.js

@@ -1,5 +1,12 @@
+// ============================================================================
+// 公共 ABI（统一管理）
+// ============================================================================
 export * as Abis from './abis/index.js';
-export { ADDRESSES, CHAIN } from './utils/constants.js';
+export { ERC20_ABI, ERC20_BALANCE_ABI, ERC20_ALLOWANCE_ABI, MULTICALL3_ABI, V2_ROUTER_ABI, V2_ROUTER_QUOTE_ABI, V3_ROUTER02_ABI, V3_ROUTER_LEGACY_ABI, V3_QUOTER_ABI, V2_FACTORY_ABI, V2_PAIR_ABI, V3_FACTORY_ABI, V3_POOL_ABI, FLAP_PORTAL_ABI, TM2_ABI, HELPER3_ABI, } from './abis/common.js';
+// ============================================================================
+// 公共常量（统一管理）
+// ============================================================================
+export { ADDRESSES, CHAIN, BLOCKRAZOR_BUILDER_EOA as BUILDER_EOA, ZERO_ADDRESS as COMMON_ZERO_ADDRESS, DEFAULT_DEADLINE_MINUTES, V3_FEE_TIERS as COMMON_V3_FEE_TIERS, } from './utils/constants.js';
 export { isExclusiveOnChain, isExclusiveOffChain } from './utils/mpcExclusive.js';
 export { 
 // Four.meme V1 授权
@@ -33,7 +40,7 @@ export { createTokenFlow } from './flows/create.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle } from './clients/club48.js';
 export { MerkleClient, createMerkleClient } from './clients/merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA } from './clients/blockrazor.js';
-export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions } from './utils/bundle-helpers.js';
+export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, getDeadline, encodeV3Path, decodeV3Path, getGasLimit, getGasPriceConfig, getTxType, getChainId, } from './utils/bundle-helpers.js';
 export { createTokenWithBundleBuy as fourCreateTokenWithBundleBuy, batchBuyWithBundle as fourBatchBuyWithBundle, batchSellWithBundle as fourBatchSellWithBundle } from './contracts/tm-bundle.js';
 export { createTokenWithBundleBuy as flapCreateTokenWithBundleBuy, batchBuyWithBundle as flapBatchBuyWithBundle, batchSellWithBundle as flapBatchSellWithBundle } from './flap/portal-bundle.js';
 export { fourPrivateBuy, fourPrivateSell, fourBatchPrivateBuy, fourBatchPrivateSell } from './contracts/tm-bundle.js';

package/dist/pancake/bundle-buy-first.js

@@ -4,12 +4,13 @@
  * 功能：钱包B先买入代币 → 钱包A卖出相同数量 → 原子执行
  */
 import { ethers, Contract, Wallet } from 'ethers';
-import { NonceManager } from '../utils/bundle-helpers.js';
-import { ADDRESSES, PROFIT_CONFIG } from '../utils/constants.js';
+import { NonceManager, getDeadline } from '../utils/bundle-helpers.js';
+import { ADDRESSES, PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA, ZERO_ADDRESS } from '../utils/constants.js';
 import { quoteV2, quoteV3, getTokenToNativeQuote, getWrappedNativeAddress } from '../utils/quote-helpers.js';
-// ✅ BlockRazor Builder EOA 地址（用于贿赂）
-// 参考文档: https://blockrazor.gitbook.io/blockrazor/bsc/block-builder/send-bundle
-const BLOCKRAZOR_BUILDER_EOA = '0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20';
+import { V2_ROUTER_ABI, V3_ROUTER02_ABI, ERC20_BALANCE_ABI, ERC20_ALLOWANCE_ABI } from '../abis/common.js';
+/**
+ * 获取 Gas Limit
+ */
 function getGasLimit(config, defaultGas = 800000) {
     if (config.gasLimit !== undefined) {
         return typeof config.gasLimit === 'bigint' ? config.gasLimit : BigInt(config.gasLimit);
@@ -33,22 +34,17 @@ async function getGasPrice(provider, config) {
     }
     return gasPrice;
 }
-// PancakeSwapProxy ABI
-const PANCAKE_PROXY_ABI = [
-    'function swapV2(uint256 amountIn, uint256 amountOutMin, address[] calldata path, address to, uint256 deadline) payable returns (uint256)',
-    'function swapV3Single(address tokenIn, address tokenOut, uint24 fee, uint256 amountIn, uint256 amountOutMin, address to) payable returns (uint256)',
-    'function swapV3MultiHop(address[] calldata lpAddresses, address exactTokenIn, uint256 amountIn, uint256 amountOutMin, address to) payable returns (uint256)'
-];
-const PANCAKE_PROXY_ADDRESS = ADDRESSES.BSC.PancakeProxy;
-const FLAT_FEE = 0n; // ✅ 已移除合约固定手续费
-const WBNB_ADDRESS = '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c';
-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
-const ERC20_BALANCE_OF_ABI = ['function balanceOf(address) view returns (uint256)'];
-const ERC20_ALLOWANCE_ABI = [
-    'function allowance(address,address) view returns (uint256)',
-    'function approve(address,uint256) returns (bool)',
-    'function decimals() view returns (uint8)'
-];
+// ✅ ABI 别名（从公共模块导入）
+const PANCAKE_V2_ROUTER_ABI = V2_ROUTER_ABI;
+const PANCAKE_V3_ROUTER_ABI = V3_ROUTER02_ABI;
+const ERC20_BALANCE_OF_ABI = ERC20_BALANCE_ABI;
+// ✅ 使用官方 PancakeSwap Router 地址
+const PANCAKE_V2_ROUTER_ADDRESS = ADDRESSES.BSC.PancakeV2Router;
+const PANCAKE_V3_ROUTER_ADDRESS = ADDRESSES.BSC.PancakeV3Router;
+// 常量
+const FLAT_FEE = 0n;
+const WBNB_ADDRESS = ADDRESSES.BSC.WBNB;
+// ✅ getDeadline 从 bundle-helpers.js 导入
 const APPROVE_INTERFACE = new ethers.Interface(['function approve(address,uint256) returns (bool)']);
 export async function pancakeBundleBuyFirstMerkle(params) {
     const { buyerPrivateKey, sellerPrivateKey, tokenAddress, routeParams, buyerFunds, buyerFundsPercentage, config, quoteToken, quoteTokenDecimals = 18 } = params;
@@ -337,7 +333,8 @@ async function ensureSellerApproval({ tokenAddress, seller, provider, decimals,
         return null;
     }
     const erc20Contract = new Contract(tokenAddress, ERC20_ALLOWANCE_ABI, provider);
-    const currentAllowance = await erc20Contract.allowance(seller.address, PANCAKE_PROXY_ADDRESS);
+    // ✅ 使用官方 V2 Router 作为授权目标
+    const currentAllowance = await erc20Contract.allowance(seller.address, PANCAKE_V2_ROUTER_ADDRESS);
     // ✅ 阈值：MaxUint256 / 2，如果授权额度超过这个值，认为是"无限授权"
     const halfMaxUint = ethers.MaxUint256 / 2n;
     if (currentAllowance >= halfMaxUint) {
@@ -346,7 +343,7 @@ async function ensureSellerApproval({ tokenAddress, seller, provider, decimals,
     const approvalNonce = await nonceManager.getNextNonce(seller);
     return await seller.signTransaction({
         to: tokenAddress,
-        data: APPROVE_INTERFACE.encodeFunctionData('approve', [PANCAKE_PROXY_ADDRESS, ethers.MaxUint256]),
+        data: APPROVE_INTERFACE.encodeFunctionData('approve', [PANCAKE_V2_ROUTER_ADDRESS, ethers.MaxUint256]),
         value: 0n,
         nonce: approvalNonce,
         gasLimit: 80000n,
@@ -356,32 +353,53 @@ async function ensureSellerApproval({ tokenAddress, seller, provider, decimals,
     });
 }
 async function buildRouteTransactions({ routeParams, buyerFundsWei, sellAmountToken, buyer, seller, tokenAddress, useNativeToken = true }) {
-    const proxyBuyer = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, buyer);
-    const proxySeller = new Contract(PANCAKE_PROXY_ADDRESS, PANCAKE_PROXY_ABI, seller);
-    const deadline = Math.floor(Date.now() / 1000) + 600;
+    const deadline = getDeadline();
     // ✅ ERC20 购买时，value 只需要 FLAT_FEE
     const buyValue = useNativeToken ? buyerFundsWei + FLAT_FEE : FLAT_FEE;
     if (routeParams.routeType === 'v2') {
         const { v2Path } = routeParams;
         const reversePath = [...v2Path].reverse();
-        const buyUnsigned = await proxyBuyer.swapV2.populateTransaction(buyerFundsWei, 0n, v2Path, buyer.address, deadline, { value: buyValue } // ✅ 使用动态 value
-        );
-        const sellUnsigned = await proxySeller.swapV2.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline, { value: FLAT_FEE });
+        // ✅ 使用官方 V2 Router
+        const v2RouterBuyer = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, buyer);
+        const v2RouterSeller = new Contract(PANCAKE_V2_ROUTER_ADDRESS, PANCAKE_V2_ROUTER_ABI, seller);
+        // 买入：BNB → Token
+        const buyUnsigned = await v2RouterBuyer.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, v2Path, buyer.address, deadline, { value: buyValue });
+        // 卖出：Token → BNB
+        const sellUnsigned = await v2RouterSeller.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountToken, 0n, reversePath, seller.address, deadline);
         return { buyUnsigned, sellUnsigned };
     }
     if (routeParams.routeType === 'v3-single') {
         const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
-        const buyUnsigned = await proxyBuyer.swapV3Single.populateTransaction(v3TokenIn, v3TokenOut, v3Fee, buyerFundsWei, 0n, buyer.address, { value: buyValue } // ✅ 使用动态 value
-        );
-        const sellUnsigned = await proxySeller.swapV3Single.populateTransaction(v3TokenOut, v3TokenIn, v3Fee, sellAmountToken, 0n, seller.address, { value: FLAT_FEE });
+        const v3RouterIface = new ethers.Interface(PANCAKE_V3_ROUTER_ABI);
+        const v3RouterBuyer = new Contract(PANCAKE_V3_ROUTER_ADDRESS, PANCAKE_V3_ROUTER_ABI, buyer);
+        const v3RouterSeller = new Contract(PANCAKE_V3_ROUTER_ADDRESS, PANCAKE_V3_ROUTER_ABI, seller);
+        // 买入：WBNB → Token
+        const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                tokenIn: v3TokenIn,
+                tokenOut: v3TokenOut,
+                fee: v3Fee,
+                recipient: buyer.address,
+                amountIn: buyerFundsWei,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n
+            }]);
+        const buyUnsigned = await v3RouterBuyer.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
+        // 卖出：Token → WBNB → BNB
+        const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                tokenIn: v3TokenOut,
+                tokenOut: v3TokenIn,
+                fee: v3Fee,
+                recipient: PANCAKE_V3_ROUTER_ADDRESS,
+                amountIn: sellAmountToken,
+                amountOutMinimum: 0n,
+                sqrtPriceLimitX96: 0n
+            }]);
+        const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
+        const sellUnsigned = await v3RouterSeller.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
         return { buyUnsigned, sellUnsigned };
     }
-    const { v3LpAddresses, v3ExactTokenIn } = routeParams;
-    const exactTokenOut = v3ExactTokenIn.toLowerCase() === WBNB_ADDRESS.toLowerCase() ? tokenAddress : WBNB_ADDRESS;
-    const buyUnsigned = await proxyBuyer.swapV3MultiHop.populateTransaction(v3LpAddresses, v3ExactTokenIn, buyerFundsWei, 0n, buyer.address, { value: buyValue } // ✅ 使用动态 value
-    );
-    const sellUnsigned = await proxySeller.swapV3MultiHop.populateTransaction(v3LpAddresses, exactTokenOut, sellAmountToken, 0n, seller.address, { value: FLAT_FEE });
-    return { buyUnsigned, sellUnsigned };
+    // V3 多跳暂不支持官方合约
+    throw new Error('V3 多跳路由暂不支持官方合约，请使用 V2 路由或 V3 单跳');
 }
 /**
  * ✅ 使用 quote-helpers 统一报价（估算利润）