four-flap-meme-sdk 4.0.13 → 4.0.14

package/dist/chains/bsc/pancake/hop-chain.js

@@ -206,6 +206,8 @@ export async function buildBNBHopChainForERC20(payer, path, finalGasAmount, gasP
         const fromWallet = path.hopWallets[i];
         const toAddress = i === hopCount - 1 ? path.targetAddress : path.hopWallets[i + 1].address;
         const amount = i === hopCount - 1 ? finalGasAmount : amountsPerHop[i + 1];
+        if (i === hopCount - 1 && amount === 0n)
+            continue;
         const tx = {
             to: toAddress,
             value: amount,

package/dist/chains/bsc/pancake/swap-quick.js

@@ -176,14 +176,9 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         sellerRequired = bribeAmount + sellerGasCost;
     }
     else {
-        // ERC20：卖方还要给每个买方转一笔买入 Gas（hop=0 直转 / hop>0 多跳）
         sellerGasCost =
-            gasPrice *
-                (BRIBE_GAS_LIMIT +
-                    finalGasLimit +
-                    (NATIVE_TRANSFER_GAS_LIMIT + ERC20_TRANSFER_GAS) * BigInt(buyers.length) +
-                    BRIBE_GAS_LIMIT);
-        sellerRequired = bribeAmount + sellerGasCost + gasPrice * finalGasLimit * BigInt(buyers.length);
+            gasPrice * (BRIBE_GAS_LIMIT + finalGasLimit + ERC20_TRANSFER_GAS * BigInt(buyers.length) + BRIBE_GAS_LIMIT);
+        sellerRequired = bribeAmount + sellerGasCost;
     }
     if (sellerBalance < sellerRequired) {
         throw new Error(`主钱包 BNB 余额不足: 需要约 ${ethers.formatEther(sellerRequired)} BNB (贿赂: ${ethers.formatEther(bribeAmount)}, Gas: ${ethers.formatEther(sellerGasCost)}), 实际 ${ethers.formatEther(sellerBalance)} BNB`);
@@ -258,7 +253,7 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         type: txType,
     });
     // ==================== 3. 转账交易（支持多跳）====================
-    const buyerGasCost = gasPrice * finalGasLimit;
+    // 买地址 gas 由用户自备，卖方只转买入金额 / 计价币
     // ✅ 生成多跳路径
     const hopPaths = generateDisperseHopPaths(buyers.map((b) => b.address), disperseHopCount, context.provider);
     // 收集所有中间钱包信息
@@ -272,7 +267,7 @@ export async function pancakeQuickBatchSwapMerkle(params) {
             const transferNonces = buyers.map((_, i) => sellerNonce + i);
             sellerNonce += buyers.length;
             transferTxs = await Promise.all(buyers.map((buyer, i) => {
-                const transferValue = transferAmountsWei[i] + FLAT_FEE + buyerGasCost;
+                const transferValue = transferAmountsWei[i] + FLAT_FEE;
                 return seller.signTransaction({
                     to: buyer.address,
                     value: transferValue,
@@ -286,30 +281,21 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         }
         else {
             const erc20Interface = new ethers.Interface(ERC20_ABI);
-            transferTxs = [];
-            for (let i = 0; i < buyers.length; i++) {
-                const buyer = buyers[i];
-                transferTxs.push(await seller.signTransaction({
-                    to: buyer.address,
-                    value: buyerGasCost,
-                    nonce: sellerNonce++,
-                    gasPrice,
-                    gasLimit: NATIVE_TRANSFER_GAS_LIMIT,
-                    chainId: context.chainId,
-                    type: txType,
-                }));
+            const transferNonces = buyers.map((_, i) => sellerNonce + i);
+            sellerNonce += buyers.length;
+            transferTxs = await Promise.all(buyers.map((buyer, i) => {
                 const transferData = erc20Interface.encodeFunctionData('transfer', [buyer.address, transferAmountsWei[i]]);
-                transferTxs.push(await seller.signTransaction({
+                return seller.signTransaction({
                     to: quoteToken,
                     data: transferData,
                     value: 0n,
-                    nonce: sellerNonce++,
+                    nonce: transferNonces[i],
                     gasPrice,
                     gasLimit: ERC20_TRANSFER_GAS,
                     chainId: context.chainId,
                     type: txType,
-                }));
-            }
+                });
+            }));
         }
     }
     else {
@@ -318,7 +304,7 @@ export async function pancakeQuickBatchSwapMerkle(params) {
             // BNB 多跳转账
             // ✅ 修复：payer 每次只发送 1 笔交易（到第一个hop钱包），hop钱包用自己的nonce=0
             const hopChains = await Promise.all(hopPaths.map((path, i) => {
-                const finalAmount = transferAmountsWei[i] + FLAT_FEE + buyerGasCost;
+                const finalAmount = transferAmountsWei[i] + FLAT_FEE;
                 const payerNonce = sellerNonce + i; // ✅ payer 每个 buyer 只用 1 个 nonce
                 return buildNativeHopChain(seller, path, finalAmount, gasPrice, context.chainId, txType, payerNonce);
             }));
@@ -328,12 +314,10 @@ export async function pancakeQuickBatchSwapMerkle(params) {
         else {
             // ERC20 多跳转账：先转 BNB（给中间钱包 gas），再转 ERC20
             // ✅ 修复：payer 每次只发送 1 笔交易（到第一个hop钱包），hop钱包用自己的nonce=0/1
-            // 1. 构建 BNB 多跳链（为中间钱包和最终钱包预留 gas）
+            // 1. 构建 BNB 多跳链（只给中间钱包 gas，买地址自备）
             const bnbHopChains = await Promise.all(hopPaths.map((path, i) => {
-                // 最终钱包需要的 gas（用于买入交易）
-                const finalGasAmount = buyerGasCost;
-                const payerNonce = sellerNonce + i; // ✅ payer 每个 buyer 只用 1 个 nonce
-                return buildBNBHopChainForERC20(seller, path, finalGasAmount, gasPrice, context.chainId, txType, payerNonce);
+                const payerNonce = sellerNonce + i;
+                return buildBNBHopChainForERC20(seller, path, 0n, gasPrice, context.chainId, txType, payerNonce);
             }));
             const bnbTxs = bnbHopChains.flat();
             sellerNonce += buyers.length; // ✅ payer 只增加 buyers.length 个 nonce

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

@@ -165,6 +165,8 @@ export async function buildBNBHopChainForERC20(payer, path, finalGasAmount, gasP
         const fromWallet = path.hopWallets[i];
         const toAddress = i === hopCount - 1 ? path.targetAddress : path.hopWallets[i + 1].address;
         const amount = i === hopCount - 1 ? finalGasAmount : amountsPerHop[i + 1];
+        if (i === hopCount - 1 && amount === 0n)
+            continue;
         signedTxs.push(await fromWallet.signTransaction({
             to: toAddress,
             value: amount,

package/dist/domains/flap/portal-bundle-merkle/swap-quick-batch.js

@@ -139,15 +139,9 @@ export async function flapQuickBatchSwapMerkle(params) {
         sellerRequired = bribeAmount + sellerGasCost;
     }
     else {
-        const reserveForBuyers = ethers.parseEther((config.reserveGasETH || 0.0005).toString());
         sellerGasCost =
-            gasPrice *
-                (BRIBE_GAS_LIMIT +
-                    finalGasLimit +
-                    (NATIVE_TRANSFER_GAS_LIMIT + ERC20_TRANSFER_GAS) * BigInt(buyers.length) +
-                    BRIBE_GAS_LIMIT);
-        sellerRequired =
-            bribeAmount + sellerGasCost + (reserveForBuyers + gasPrice * finalGasLimit) * BigInt(buyers.length);
+            gasPrice * (BRIBE_GAS_LIMIT + finalGasLimit + ERC20_TRANSFER_GAS * BigInt(buyers.length) + BRIBE_GAS_LIMIT);
+        sellerRequired = bribeAmount + sellerGasCost;
     }
     if (sellerBalance < sellerRequired) {
         throw new Error(`主钱包 ${chainContext.nativeToken} 余额不足: 需要约 ${ethers.formatEther(sellerRequired)} (贿赂: ${ethers.formatEther(bribeAmount)}, Gas: ${ethers.formatEther(sellerGasCost)}), 实际 ${ethers.formatEther(sellerBalance)}`);
@@ -189,8 +183,6 @@ export async function flapQuickBatchSwapMerkle(params) {
     });
     const signedSell = await seller.signTransaction(sellTx);
     // ==================== 3. 转账交易（支持多跳）====================
-    const reserveGas = ethers.parseEther((config.reserveGasETH || 0.0005).toString());
-    const buyerGasCost = gasPrice * finalGasLimit;
     // ✅ 生成多跳路径
     const hopPaths = generateDisperseHopPaths(buyers.map((b) => b.address), disperseHopCount, chainContext.provider);
     // 收集所有中间钱包信息
@@ -204,7 +196,7 @@ export async function flapQuickBatchSwapMerkle(params) {
             const transferNonces = buyers.map((_, i) => sellerNonce + i);
             sellerNonce += buyers.length;
             transferTxs = await Promise.all(buyers.map((buyer, i) => {
-                const transferValue = transferAmountsWei[i] + reserveGas + buyerGasCost;
+                const transferValue = transferAmountsWei[i];
                 return seller.signTransaction({
                     to: buyer.address,
                     value: transferValue,
@@ -218,30 +210,21 @@ export async function flapQuickBatchSwapMerkle(params) {
         }
         else {
             const erc20Interface = new ethers.Interface(ERC20_ABI);
-            transferTxs = [];
-            for (let i = 0; i < buyers.length; i++) {
-                const buyer = buyers[i];
-                transferTxs.push(await seller.signTransaction({
-                    to: buyer.address,
-                    value: reserveGas + buyerGasCost,
-                    nonce: sellerNonce++,
-                    gasPrice,
-                    gasLimit: NATIVE_TRANSFER_GAS_LIMIT,
-                    chainId: chainContext.chainId,
-                    type: txType,
-                }));
+            const transferNonces = buyers.map((_, i) => sellerNonce + i);
+            sellerNonce += buyers.length;
+            transferTxs = await Promise.all(buyers.map((buyer, i) => {
                 const transferData = erc20Interface.encodeFunctionData('transfer', [buyer.address, transferAmountsWei[i]]);
-                transferTxs.push(await seller.signTransaction({
+                return seller.signTransaction({
                     to: quoteToken,
                     data: transferData,
                     value: 0n,
-                    nonce: sellerNonce++,
+                    nonce: transferNonces[i],
                     gasPrice,
                     gasLimit: ERC20_TRANSFER_GAS,
                     chainId: chainContext.chainId,
                     type: txType,
-                }));
-            }
+                });
+            }));
         }
     }
     else {
@@ -250,7 +233,7 @@ export async function flapQuickBatchSwapMerkle(params) {
             // 原生代币多跳转账
             // ✅ 修复：payer 每次只发送 1 笔交易（到第一个hop钱包），hop钱包用自己的nonce=0
             const hopChains = await Promise.all(hopPaths.map((path, i) => {
-                const finalAmount = transferAmountsWei[i] + reserveGas + buyerGasCost;
+                const finalAmount = transferAmountsWei[i];
                 const payerNonce = sellerNonce + i; // ✅ payer 每个 buyer 只用 1 个 nonce
                 return buildNativeHopChain(seller, path, finalAmount, gasPrice, chainContext.chainId, txType, payerNonce);
             }));
@@ -262,7 +245,7 @@ export async function flapQuickBatchSwapMerkle(params) {
             // ✅ 修复：payer 每次只发送 1 笔交易（到第一个hop钱包），hop钱包用自己的nonce=0/1
             // 1. 构建 BNB 多跳链
             const bnbHopChains = await Promise.all(hopPaths.map((path, i) => {
-                const finalGasAmount = buyerGasCost;
+                const finalGasAmount = 0n;
                 const payerNonce = sellerNonce + i; // ✅ payer 每个 buyer 只用 1 个 nonce
                 return buildBNBHopChainForERC20(seller, path, finalGasAmount, gasPrice, chainContext.chainId, txType, payerNonce);
             }));

package/package.json

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