four-flap-meme-sdk 1.4.53 → 1.4.55

package/dist/clients/four.js

@@ -1,7 +1,7 @@
 export class FourClient {
     constructor(cfg) {
         // 默认使用 Cloudflare Workers 代理，已配置 CORS，浏览器可直接使用
-        this.baseUrl = cfg?.baseUrl || 'https://throbbing-shape-a160.paulalsop072.workers.dev';
+        this.baseUrl = cfg?.baseUrl || 'https://bscfourapi.emit.tools';
     }
     async generateNonce(req) {
         const r = await fetch(`${this.baseUrl}/v1/private/user/nonce/generate`, {

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

@@ -1,3 +1,3 @@
 export declare const TM_ABI: string[];
 export declare const HELPER3_ABI: string[];
-export declare const TM_ADDRESS: "0x342399a59943B5815849657Aa0e06D7058D9d5C6";
+export declare const TM_ADDRESS: "0x5c952063c7fc8610FFDB798152D69F0B9550762b";

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

@@ -14,4 +14,5 @@ export const HELPER3_ABI = [
     'function tryBuy(address token, uint256 amount, uint256 funds) view returns (address tokenManager, address quote, uint256 estimatedAmount, uint256 estimatedCost, uint256 estimatedFee, uint256 amountMsgValue, uint256 amountApproval, uint256 amountFunds)',
     'function trySell(address token, uint256 amount) view returns (address tokenManager, address quote, uint256 funds, uint256 fee)'
 ];
-export const TM_ADDRESS = ADDRESSES.BSC.TokenManagerV2Proxy;
+// ✅ Four.meme 使用 TokenManagerOriginal（代理合约已移除）
+export const TM_ADDRESS = ADDRESSES.BSC.TokenManagerOriginal;

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

@@ -700,7 +700,10 @@ export async function sweepWithBundleMerkle(params) {
                 _batchGetBalances(provider, addresses)
             ]);
             const gasCostBase = nativeGasLimit * gasPrice;
-            const profitTxGas = nativeGasLimit * gasPrice;
+            // ✅ 修复：利润多跳需要 PROFIT_HOP_COUNT + 1 笔交易的 gas（payer → hop1 → hop2 → 利润地址）
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit
+            const PROFIT_HOP_GAS_LIMIT = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // ✅ 第一步：计算所有钱包的归集金额和利润，找出归集金额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;
@@ -843,7 +846,10 @@ export async function sweepWithBundleMerkle(params) {
                 config.checkBnbForErc20NoHop ? _batchGetBalances(provider, addresses) : Promise.resolve([])
             ]);
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            const profitTxGas = finalGasLimit * gasPrice;
+            // ✅ 修复：利润多跳需要 PROFIT_HOP_COUNT + 1 笔交易的 gas
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit
+            const PROFIT_HOP_GAS_LIMIT_ERC20 = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT_ERC20 * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // ✅ 第一步：计算所有钱包的归集金额和利润，找出归集金额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;

package/dist/contracts/tm-bundle.js

@@ -176,7 +176,7 @@ export async function createTokenWithBundleBuy(params) {
         clickFun: false,
     });
     // 4. 构建交易
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     // ✅ 获取 gas price
     let gasPrice;
     if (club48) {
@@ -403,7 +403,7 @@ export async function batchBuyWithBundle(params) {
         explorerEndpoint: config.club48ExplorerEndpoint
     });
     const blockOffset = config.bundleBlockOffset ?? 100;
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const gasPrice = await club48.getMinGasPrice();
     const signedTxs = [];
     const nextNonceMap = new Map();
@@ -535,7 +535,7 @@ export async function batchSellWithBundle(params) {
         explorerEndpoint: config.club48ExplorerEndpoint
     });
     const blockOffset = config.bundleBlockOffset ?? 100;
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const gasPrice = await club48.getMinGasPrice();
     const signedTxs = [];
     const nextNonceMap = new Map();
@@ -666,7 +666,7 @@ export async function fourPrivateBuy(params) {
     const provider = new JsonRpcProvider(rpcUrl);
     const wallet = new Wallet(privateKey, provider);
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const gasPrice = await club48.getMinGasPrice();
     const fundsWei = ethers.parseEther(funds);
     const minAmount = 0n;
@@ -686,7 +686,7 @@ export async function fourPrivateSell(params) {
     const provider = new JsonRpcProvider(rpcUrl);
     const wallet = new Wallet(privateKey, provider);
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const gasPrice = await club48.getMinGasPrice();
     const amountWei = ethers.parseUnits(amount, 18);
     const minOut = minFunds ?? 0n;
@@ -707,7 +707,7 @@ export async function fourBatchPrivateBuy(params) {
         throw new Error('privateKeys and fundsList length mismatch');
     const provider = new JsonRpcProvider(rpcUrl);
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     // ✅ 并行处理
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));
     const fundsWeiList = fundsList.map(f => ethers.parseEther(f));
@@ -757,7 +757,7 @@ export async function fourBatchPrivateSell(params) {
         throw new Error('privateKeys and amounts length mismatch');
     const provider = new JsonRpcProvider(rpcUrl);
     const club48 = new Club48Client({ endpoint: club48Endpoint, explorerEndpoint: club48ExplorerEndpoint });
-    const tmAddr = ADDRESSES.BSC.TokenManagerV2Proxy;
+    const tmAddr = ADDRESSES.BSC.TokenManagerOriginal;
     const minOut = minFundsEach ?? 0n;
     // ✅ 并行处理
     const wallets = privateKeys.map(pk => new Wallet(pk, provider));

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

@@ -502,7 +502,9 @@ export async function flapSweepWithBundleMerkle(params) {
                 batchGetBalances(provider, addresses)
             ]);
             const gasCostBase = nativeGasLimit * gasPrice;
-            const profitTxGas = nativeGasLimit * gasPrice;
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit，需要 PROFIT_HOP_COUNT + 1 笔交易
+            const PROFIT_HOP_GAS_LIMIT = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             // 第一步：计算所有钱包的归集金额，找出余额最大的钱包
             const sweepAmounts = [];
             let maxSweepIndex = -1;
@@ -633,7 +635,9 @@ export async function flapSweepWithBundleMerkle(params) {
                 batchGetBalances(provider, addresses)
             ]);
             const iface = new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
-            const profitTxGas = finalGasLimit * gasPrice;
+            // ✅ 统一使用 21055n 作为利润多跳的 gas limit，需要 PROFIT_HOP_COUNT + 1 笔交易
+            const PROFIT_HOP_GAS_LIMIT_ERC20 = 21055n;
+            const profitTxGas = PROFIT_HOP_GAS_LIMIT_ERC20 * gasPrice * BigInt(PROFIT_HOP_COUNT + 1);
             const sweepAmounts = [];
             let maxSweepIndex = -1;
             let maxSweepAmount = 0n;

package/dist/utils/constants.d.ts

@@ -55,8 +55,6 @@ export declare const ADDRESSES: {
         readonly USDC: "0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d";
         readonly BUSD: "0xe9e7CEA3DedcA5984780Bafc599bD69ADd087D56";
         readonly TokenManagerOriginal: "0x5c952063c7fc8610FFDB798152D69F0B9550762b";
-        readonly TokenManagerV1Proxy: "0xf7F823d0E790219dBf727bDb971837574655fCB0";
-        readonly TokenManagerV2Proxy: "0x342399a59943B5815849657Aa0e06D7058D9d5C6";
         readonly TokenManagerV1: "0xf7F823d0E790219dBf727bDb971837574655fCB0";
         readonly TokenManagerV2: "0x342399a59943B5815849657Aa0e06D7058D9d5C6";
         readonly TokenManagerHelper3: "0xF251F83e40a78868FcfA3FA4599Dad6494E46034";

package/dist/utils/constants.js

@@ -51,9 +51,6 @@ export const ADDRESSES = {
         // ========== Four.meme 合约 ==========
         // 原始合约（TokenManager2，创建代币专用，不收费）
         TokenManagerOriginal: '0x5c952063c7fc8610FFDB798152D69F0B9550762b',
-        // 代理合约（收费版，仅交易）
-        TokenManagerV1Proxy: '0xf7F823d0E790219dBf727bDb971837574655fCB0',
-        TokenManagerV2Proxy: '0x342399a59943B5815849657Aa0e06D7058D9d5C6',
         // ✅ 向后兼容别名（保持旧代码可用）
         TokenManagerV1: '0xf7F823d0E790219dBf727bDb971837574655fCB0',
         TokenManagerV2: '0x342399a59943B5815849657Aa0e06D7058D9d5C6',

package/dist/utils/erc20.js

@@ -299,7 +299,7 @@ function resolveSpenderAddress(chain, platform) {
             MONAD: ADDRESSES.MONAD.FlapPortal, // ✅ Monad Flap Portal
         },
         four: {
-            // Four.meme 使用 TokenManagerOriginal（买卖交易实际使用的合约）
+            // ✅ Four.meme 使用 TokenManagerOriginal（代理合约已移除）
             BSC: ADDRESSES.BSC.TokenManagerOriginal,
             BASE: ADDRESSES.BASE.TokenManagerHelper3,
             XLAYER: ZERO_ADDRESS, // XLAYER 暂不支持 Four.meme

package/dist/utils/holders-maker.js

@@ -264,26 +264,35 @@ async function buildV2BuyTx(wallet, tokenAddress, buyAmount, nonce, gasPrice, ga
 /**
  * 构建 V3 单跳买入交易
  * BNB → Token (使用 exactInputSingle + multicall)
+ *
+ * ✅ 修复：使用 ethers.Interface 手动编码 calldata，避免 multicall 重载问题
  */
 async function buildV3BuyTx(wallet, tokenAddress, buyAmount, nonce, gasPrice, gasLimit, chainId, txType, v3Fee = 2500 // 默认 0.25% 手续费
 ) {
     const deadline = getDeadline();
     const v3RouterIface = new ethers.Interface(V3_ROUTER02_ABI);
     // 构建 exactInputSingle calldata
-    const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-            tokenIn: WBNB_ADDRESS,
-            tokenOut: tokenAddress,
-            fee: v3Fee,
-            recipient: wallet.address,
-            amountIn: buyAmount,
-            amountOutMinimum: 0n,
-            sqrtPriceLimitX96: 0n
-        }]);
-    // 使用 multicall 包装，传入 deadline 和 ETH value
-    const v3Router = new Contract(PANCAKE_V3_ROUTER_ADDRESS, V3_ROUTER02_ABI, wallet);
-    const unsigned = await v3Router.multicall.populateTransaction(deadline, [exactInputSingleData], { value: buyAmount });
+    const swapParams = {
+        tokenIn: WBNB_ADDRESS,
+        tokenOut: tokenAddress,
+        fee: v3Fee,
+        recipient: wallet.address,
+        amountIn: buyAmount,
+        amountOutMinimum: 0n,
+        sqrtPriceLimitX96: 0n
+    };
+    const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [swapParams]);
+    // ✅ 添加 refundETH，退还多余的 ETH
+    const refundETHData = v3RouterIface.encodeFunctionData('refundETH', []);
+    // ✅ 使用明确的函数签名编码 multicall，避免重载问题
+    const multicallData = v3RouterIface.encodeFunctionData('multicall(uint256,bytes[])', [
+        deadline,
+        [exactInputSingleData, refundETHData]
+    ]);
     const tx = {
-        ...unsigned,
+        to: PANCAKE_V3_ROUTER_ADDRESS,
+        data: multicallData,
+        value: buyAmount,
         nonce,
         gasLimit: BigInt(gasLimit),
         chainId
@@ -331,25 +340,32 @@ async function buildV2BuyTxWithERC20(wallet, tokenAddress, baseTokenAddress, buy
 /**
  * 构建 V3 买入交易（ERC20 输入）
  * USDT/USDC → Token (使用 exactInputSingle + multicall)
+ *
+ * ✅ 修复：使用 ethers.Interface 手动编码 calldata，避免 multicall 重载问题
  */
 async function buildV3BuyTxWithERC20(wallet, tokenAddress, baseTokenAddress, buyAmount, nonce, gasPrice, gasLimit, chainId, txType, v3Fee = 2500) {
     const deadline = getDeadline();
     const v3RouterIface = new ethers.Interface(V3_ROUTER02_ABI);
     // 构建 exactInputSingle calldata
-    const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
-            tokenIn: baseTokenAddress,
-            tokenOut: tokenAddress,
-            fee: v3Fee,
-            recipient: wallet.address,
-            amountIn: buyAmount,
-            amountOutMinimum: 0n,
-            sqrtPriceLimitX96: 0n
-        }]);
-    // 使用 multicall 包装（无需 ETH value）
-    const v3Router = new Contract(PANCAKE_V3_ROUTER_ADDRESS, V3_ROUTER02_ABI, wallet);
-    const unsigned = await v3Router.multicall.populateTransaction(deadline, [exactInputSingleData]);
+    const swapParams = {
+        tokenIn: baseTokenAddress,
+        tokenOut: tokenAddress,
+        fee: v3Fee,
+        recipient: wallet.address,
+        amountIn: buyAmount,
+        amountOutMinimum: 0n,
+        sqrtPriceLimitX96: 0n
+    };
+    const exactInputSingleData = v3RouterIface.encodeFunctionData('exactInputSingle', [swapParams]);
+    // ✅ 使用明确的函数签名编码 multicall，避免重载问题
+    const multicallData = v3RouterIface.encodeFunctionData('multicall(uint256,bytes[])', [
+        deadline,
+        [exactInputSingleData]
+    ]);
     const tx = {
-        ...unsigned,
+        to: PANCAKE_V3_ROUTER_ADDRESS,
+        data: multicallData,
+        value: 0n,
         nonce,
         gasLimit: BigInt(gasLimit),
         chainId

package/package.json

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