four-flap-meme-sdk 1.3.99 → 1.4.2

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

@@ -2,7 +2,7 @@ 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 { CHAIN_ID_MAP, PORTAL_ABI, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient } from './config.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;
 /**
@@ -32,27 +32,55 @@ export async function flapPrivateBuyMerkle(params) {
         }, { value: actualAmountWei })
     ]);
     const gasLimit = resolveGasLimit(config.gasLimitMultiplier);
-    const signedTxs = [];
-    signedTxs.push(await wallet.signTransaction({
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
+    const needProfitTx = extractProfit && profitWei > 0n;
+    // ✅ 分配 nonces：贿赂 → 买入 → 利润
+    let nonceIdx = 0;
+    const bribeNonce = needBribeTx ? currentNonce + nonceIdx++ : undefined;
+    const buyNonce = currentNonce + nonceIdx++;
+    const profitNonce = needProfitTx ? currentNonce + nonceIdx : undefined;
+    // ✅ 并行签名所有交易（贿赂、买入、利润）
+    const signPromises = [];
+    const txType = getTxType(config);
+    // 贿赂交易
+    if (needBribeTx && bribeNonce !== undefined) {
+        signPromises.push(wallet.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: txType
+        }));
+    }
+    // 买入交易
+    signPromises.push(wallet.signTransaction({
         ...unsigned,
         from: wallet.address,
-        nonce: currentNonce,
+        nonce: buyNonce,
         gasLimit,
         gasPrice,
         chainId,
-        type: getTxType(config),
+        type: txType,
         value: actualAmountWei
     }));
-    await appendSingleProfitTransfer({
-        extractProfit,
-        profitWei,
-        wallet,
-        baseNonce: currentNonce,
-        gasPrice,
-        chainId,
-        config,
-        signedTxs
-    });
+    // 利润交易
+    if (needProfitTx && profitNonce !== undefined) {
+        signPromises.push(wallet.signTransaction({
+            to: getProfitRecipient(),
+            value: profitWei,
+            nonce: profitNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: txType
+        }));
+    }
+    // ✅ 并行签名完成后按顺序返回
+    const signedTxs = await Promise.all(signPromises);
     return { signedTransactions: signedTxs };
 }
 /**
@@ -65,41 +93,73 @@ export async function flapPrivateSellMerkle(params) {
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const amountWei = ethers.parseUnits(amount, 18);
     const portal = new ethers.Contract(portalAddr, PORTAL_ABI, wallet);
-    // ✅ 并行获取 gasPrice、nonce 和报价
-    const [gasPrice, currentNonce, { quotedOutput, minOut }] = await Promise.all([
+    // ✅ 并行获取 gasPrice、nonce、报价和构建未签名交易
+    const [gasPrice, currentNonce, { quotedOutput }, unsigned] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         wallet.getNonce(),
-        resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutputAmount)
+        resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutputAmount),
+        portal.swapExactInput.populateTransaction({
+            inputToken: tokenAddress,
+            outputToken: ZERO_ADDRESS,
+            inputAmount: amountWei,
+            minOutputAmount: 0n, // ✅ 已移除滑点保护
+            permitData: '0x',
+        })
     ]);
-    // 构建未签名交易
-    const unsigned = await portal.swapExactInput.populateTransaction({
-        inputToken: tokenAddress,
-        outputToken: ZERO_ADDRESS,
-        inputAmount: amountWei,
-        minOutputAmount: minOut,
-        permitData: '0x',
-    });
     const gasLimit = resolveGasLimit(config.gasLimitMultiplier);
-    const signedTxs = [];
-    signedTxs.push(await wallet.signTransaction({
+    const txType = getTxType(config);
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
+    // ✅ 利润计算
+    const extractProfit = shouldExtractProfit(config);
+    const { profit: profitWei } = extractProfit && quotedOutput > 0n
+        ? calculateProfit(quotedOutput, config)
+        : { profit: 0n };
+    const needProfitTx = extractProfit && profitWei > 0n;
+    // ✅ 分配 nonces：贿赂 → 卖出 → 利润
+    let nonceIdx = 0;
+    const bribeNonce = needBribeTx ? currentNonce + nonceIdx++ : undefined;
+    const sellNonce = currentNonce + nonceIdx++;
+    const profitNonce = needProfitTx ? currentNonce + nonceIdx : undefined;
+    // ✅ 并行签名所有交易（贿赂、卖出、利润）
+    const signPromises = [];
+    // 贿赂交易
+    if (needBribeTx && bribeNonce !== undefined) {
+        signPromises.push(wallet.signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: txType
+        }));
+    }
+    // 卖出交易
+    signPromises.push(wallet.signTransaction({
         ...unsigned,
         from: wallet.address,
-        nonce: currentNonce,
+        nonce: sellNonce,
         gasLimit,
         gasPrice,
         chainId,
-        type: getTxType(config)
+        type: txType
     }));
-    await appendSingleSellProfitTransfer({
-        extractProfit: shouldExtractProfit(config),
-        quotedOutput,
-        wallet,
-        baseNonce: currentNonce,
-        gasPrice,
-        chainId,
-        config,
-        signedTxs
-    });
+    // 利润交易
+    if (needProfitTx && profitNonce !== undefined) {
+        signPromises.push(wallet.signTransaction({
+            to: getProfitRecipient(),
+            value: profitWei,
+            nonce: profitNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: txType
+        }));
+    }
+    // ✅ 并行签名完成后按顺序返回
+    const signedTxs = await Promise.all(signPromises);
     return { signedTransactions: signedTxs };
 }
 /**
@@ -121,6 +181,10 @@ export async function flapBatchPrivateBuyMerkle(params) {
     const maxFundsIndex = findMaxIndex(originalAmountsWei);
     const minOuts = resolveBatchMinOutputs(minOutputAmounts, wallets.length);
     const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
+    const needProfitTx = extractProfit && totalProfit > 0n;
     // ✅ 并行获取 gasPrice、所有 nonces 和构建未签名交易
     const [gasPrice, initialNonces, unsignedList] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
@@ -133,14 +197,39 @@ export async function flapBatchPrivateBuyMerkle(params) {
             permitData: '0x',
         }, { value: actualAmountsWei[i] })))
     ]);
-    // ✅ 为需要支付利润的钱包预留额外 nonce
+    // ✅ 分配 nonces：贿赂(可选) → 买入 → 利润(可选)
+    let payerNonceOffset = 0;
+    let bribeNonce;
+    if (needBribeTx && maxFundsIndex >= 0) {
+        bribeNonce = initialNonces[maxFundsIndex];
+        payerNonceOffset++;
+    }
     const nonces = initialNonces.map((n, i) => {
-        // 如果这个钱包需要支付利润，它的主交易 nonce 不变，利润交易用 nonce+1
+        if (i === maxFundsIndex) {
+            return n + payerNonceOffset; // payer 的买入 nonce 需要偏移
+        }
         return n;
     });
+    const profitNonce = needProfitTx && maxFundsIndex >= 0
+        ? initialNonces[maxFundsIndex] + payerNonceOffset + 1
+        : undefined;
     const gasLimit = resolveGasLimit(config.gasLimitMultiplier);
     const gasLimits = new Array(wallets.length).fill(gasLimit);
-    // ✅ 并行签名所有交易
+    const signedTxs = [];
+    // ✅ 贿赂交易放在首位
+    if (needBribeTx && bribeNonce !== undefined && maxFundsIndex >= 0) {
+        const bribeTx = await wallets[maxFundsIndex].signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: getTxType(config)
+        });
+        signedTxs.push(bribeTx);
+    }
+    // ✅ 并行签名所有买入交易
     const signedList = await signBatchTransactions({
         unsignedList,
         wallets,
@@ -151,10 +240,9 @@ export async function flapBatchPrivateBuyMerkle(params) {
         config,
         values: actualAmountsWei
     });
-    const signedTxs = [...signedList];
-    // 添加利润交易（使用 nonce + 1）
-    if (extractProfit && totalProfit > 0n && maxFundsIndex >= 0) {
-        const profitNonce = initialNonces[maxFundsIndex] + 1;
+    signedTxs.push(...signedList);
+    // ✅ 利润交易放在末尾
+    if (needProfitTx && profitNonce !== undefined && maxFundsIndex >= 0) {
         const profitTx = await wallets[maxFundsIndex].signTransaction({
             to: getProfitRecipient(),
             value: totalProfit,
@@ -182,50 +270,75 @@ export async function flapBatchPrivateSellMerkle(params) {
     const amountsWei = amounts.map(a => ethers.parseUnits(a, 18));
     const portal = new ethers.Contract(portalAddr, PORTAL_ABI, provider);
     const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
-    // ✅ 并行获取 gasPrice、所有 nonces 和所有报价
-    const [gasPrice, initialNonces, quotedOutputs] = await Promise.all([
+    // ✅ 并行获取 gasPrice、所有 nonces、所有报价和构建未签名交易
+    const [gasPrice, initialNonces, quotedOutputs, unsignedList] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         Promise.all(wallets.map(w => w.getNonce())),
         Promise.all(amountsWei.map(amount => portal.quoteExactInput.staticCall({
             inputToken: tokenAddress,
             outputToken: ZERO_ADDRESS,
             inputAmount: amount
-        }).catch(() => 0n)))
+        }).catch(() => 0n))),
+        // ✅ 并行构建未签名交易（已移除滑点保护：minOuts 固定为 0）
+        Promise.all(portals.map((p, i) => p.swapExactInput.populateTransaction({
+            inputToken: tokenAddress,
+            outputToken: ZERO_ADDRESS,
+            inputAmount: amountsWei[i],
+            minOutputAmount: 0n,
+            permitData: '0x'
+        })))
     ]);
-    // 计算 minOuts
-    let minOuts;
-    if (minOutputAmounts && minOutputAmounts.length === wallets.length) {
-        minOuts = minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseEther(m) : m);
-    }
-    else {
-        minOuts = quotedOutputs.map(quoted => quoted * 95n / 100n);
-    }
-    // ✅ 并行构建未签名交易
-    const unsignedList = await Promise.all(portals.map((p, i) => p.swapExactInput.populateTransaction({
-        inputToken: tokenAddress,
-        outputToken: ZERO_ADDRESS,
-        inputAmount: amountsWei[i],
-        minOutputAmount: minOuts[i],
-        permitData: '0x'
-    })));
     const extractProfit = shouldExtractProfit(config);
     const { totalProfit, maxRevenueIndex } = summarizeSellProfits(quotedOutputs, extractProfit, config);
+    // ✅ 获取贿赂金额
+    const bribeAmount = getBribeAmount(config);
+    const needBribeTx = bribeAmount > 0n;
+    const needProfitTx = extractProfit && totalProfit > 0n;
+    // ✅ 分配 nonces：贿赂(可选) → 卖出 → 利润(可选)
+    let payerNonceOffset = 0;
+    let bribeNonce;
+    if (needBribeTx && maxRevenueIndex >= 0) {
+        bribeNonce = initialNonces[maxRevenueIndex];
+        payerNonceOffset++;
+    }
+    const nonces = initialNonces.map((n, i) => {
+        if (i === maxRevenueIndex) {
+            return n + payerNonceOffset; // payer 的卖出 nonce 需要偏移
+        }
+        return n;
+    });
+    const profitNonce = needProfitTx && maxRevenueIndex >= 0
+        ? initialNonces[maxRevenueIndex] + payerNonceOffset + 1
+        : undefined;
     const gasLimit = resolveGasLimit(config.gasLimitMultiplier);
     const gasLimits = new Array(wallets.length).fill(gasLimit);
+    const signedTxs = [];
+    // ✅ 贿赂交易放在首位
+    if (needBribeTx && bribeNonce !== undefined && maxRevenueIndex >= 0) {
+        const bribeTx = await wallets[maxRevenueIndex].signTransaction({
+            to: BLOCKRAZOR_BUILDER_EOA,
+            value: bribeAmount,
+            nonce: bribeNonce,
+            gasPrice,
+            gasLimit: 21000n,
+            chainId,
+            type: getTxType(config)
+        });
+        signedTxs.push(bribeTx);
+    }
     // ✅ 并行签名所有卖出交易
     const signedList = await signBatchTransactions({
         unsignedList,
         wallets,
-        nonces: initialNonces,
+        nonces,
         gasLimits,
         gasPrice,
         chainId,
         config
     });
-    const signedTxs = [...signedList];
-    // 添加利润交易（使用 nonce + 1）
-    if (extractProfit && totalProfit > 0n && maxRevenueIndex >= 0) {
-        const profitNonce = initialNonces[maxRevenueIndex] + 1;
+    signedTxs.push(...signedList);
+    // ✅ 利润交易放在末尾
+    if (needProfitTx && profitNonce !== undefined && maxRevenueIndex >= 0) {
         const profitTx = await wallets[maxRevenueIndex].signTransaction({
             to: getProfitRecipient(),
             value: totalProfit,
@@ -315,7 +428,7 @@ async function resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutp
         });
         return {
             quotedOutput,
-            minOut: quotedOutput * 95n / 100n
+            minOut: 0n // ✅ 已移除滑点保护：minOut 固定为 0
         };
     }
     catch {

package/package.json

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