four-flap-meme-sdk 1.7.67 → 1.7.69

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

@@ -315,26 +315,48 @@ export async function disperseWithBundleMerkle(params) {
             // ✅ 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 利润以代币计
+            // ✅ 先计算所有原始金额和预估 ERC20 利润
             let totalTokenProfit = 0n;
-            const txDataList = recipients.map((to, i) => {
+            const originalAmounts = [];
+            for (let i = 0; i < recipients.length; i++) {
                 const originalAmount = ethers.parseUnits(normalizedAmounts[i], decimals);
+                originalAmounts.push(originalAmount);
                 totalAmountBeforeProfit += originalAmount;
-                let actualAmount = originalAmount;
                 if (extractProfit) {
-                    const { profit, remaining } = calculateProfit(originalAmount, userType);
-                    actualAmount = remaining;
-                    totalTokenProfit += profit; // 累计 ERC20 代币利润
+                    const { profit } = calculateProfit(originalAmount, userType);
+                    totalTokenProfit += profit; // 累计 ERC20 代币利润（用于报价）
                 }
-                const data = iface.encodeFunctionData('transfer', [to, actualAmount]);
-                return { data, nonce: nonces[i] };
-            });
-            // ✅ 获取 ERC20 利润等值的原生代币（BNB）报价
+            }
+            // ✅ 获取 ERC20 利润等值的原生代币（OKB/BNB）报价
             let nativeProfitAmount = 0n;
+            let profitIsNative = false; // 标记利润是否以原生代币扣除
             if (extractProfit && totalTokenProfit > 0n) {
                 nativeProfitAmount = await getTokenToNativeQuote(provider, tokenAddress, totalTokenProfit, chainIdNum, tokenPoolType, quoteToken, config.rpcUrl);
-                totalProfit = nativeProfitAmount; // 更新为原生代币利润
+                // ✅ 判断报价是否成功（不是 MIN_PROFIT_WEI 且大于合理阈值）
+                profitIsNative = nativeProfitAmount > MIN_PROFIT_WEI;
+                if (profitIsNative) {
+                    totalProfit = nativeProfitAmount;
+                    console.log(`[disperse ERC20] 报价成功，以 OKB 扣除利润: ${ethers.formatEther(nativeProfitAmount)} OKB`);
+                }
+                else {
+                    console.log(`[disperse ERC20] 报价失败或过低，以 ERC20 扣除利润: ${ethers.formatUnits(totalTokenProfit, decimals)} Token`);
+                }
             }
+            // ✅ 根据报价结果决定分发金额
+            // 报价成功：全额分发 ERC20，只扣 OKB
+            // 报价失败：扣 ERC20 利润
+            const txDataList = recipients.map((to, i) => {
+                const originalAmount = originalAmounts[i];
+                let actualAmount = originalAmount;
+                if (extractProfit && !profitIsNative) {
+                    // 报价失败：从 ERC20 中扣除利润
+                    const { remaining } = calculateProfit(originalAmount, userType);
+                    actualAmount = remaining;
+                }
+                // 报价成功：全额分发 ERC20（不扣 ERC20）
+                const data = iface.encodeFunctionData('transfer', [to, actualAmount]);
+                return { data, nonce: nonces[i] };
+            });
             // ✅ 并行签名所有交易
             const txPromises = txDataList.map(({ data, nonce }) => mainWallet.signTransaction({
                 to: tokenAddress,
@@ -347,8 +369,8 @@ export async function disperseWithBundleMerkle(params) {
                 type: txType
             }));
             signedTxs.push(...(await Promise.all(txPromises)));
-            // ✅ 利润多跳转账（强制 2 跳中转）- ERC20 利润转等值原生代币
-            if (extractProfit && nativeProfitAmount > 0n) {
+            // ✅ 利润多跳转账（强制 2 跳中转）- 仅在报价成功时扣 OKB
+            if (extractProfit && profitIsNative && nativeProfitAmount > 0n) {
                 const profitHopResult = await buildProfitHopTransactions({
                     provider,
                     payerWallet: mainWallet,

package/dist/eip7702/xlayer/multi-hop-transfer.js

@@ -771,11 +771,12 @@ export async function pairwiseTransfer(params) {
             // 直接转账：sender → receiver
             // ========================================
             if (isNative) {
+                // ✅ 使用 transferAmount 转移指定金额（而不是 transferTo 全额）
                 calls.push({
                     target: senderWallet.address,
                     allowFailure: false,
                     value: shouldPassValue ? amtWei : 0n,
-                    callData: delegateInterface.encodeFunctionData('transferTo', [receiver]),
+                    callData: delegateInterface.encodeFunctionData('transferAmount', [receiver, amtWei]),
                 });
             }
             else {
@@ -810,14 +811,14 @@ export async function pairwiseTransfer(params) {
             const lastHop = hopWallets[hopWallets.length - 1];
             if (isNative) {
                 // 原生 OKB 多跳
-                // sender → 第一个中间钱包
+                // ✅ sender → 第一个中间钱包（使用 transferAmount 转移指定金额）
                 calls.push({
                     target: senderWallet.address,
                     allowFailure: false,
                     value: shouldPassValue ? amtWei : 0n,
-                    callData: delegateInterface.encodeFunctionData('transferTo', [firstHop.address]),
+                    callData: delegateInterface.encodeFunctionData('transferAmount', [firstHop.address, amtWei]),
                 });
-                // 中间钱包之间转账
+                // 中间钱包之间转账（使用 transferTo，因为中间钱包只有这笔钱）
                 for (let j = 0; j < hopWallets.length - 1; j++) {
                     calls.push({
                         target: hopWallets[j].address,
@@ -826,7 +827,7 @@ export async function pairwiseTransfer(params) {
                         callData: delegateInterface.encodeFunctionData('transferTo', [hopWallets[j + 1].address]),
                     });
                 }
-                // 最后一个中间钱包 → receiver
+                // 最后一个中间钱包 → receiver（使用 transferTo 转移全部）
                 calls.push({
                     target: lastHop.address,
                     allowFailure: false,

package/package.json

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