four-flap-meme-sdk 2.2.8 → 2.2.10

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

@@ -1,10 +1,10 @@
-import { ethers, Wallet, JsonRpcProvider } from 'ethers';
+import { ethers, Wallet } from 'ethers';
 import { MerkleClient } from '../../clients/merkle.js';
 import { getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
-import { ZERO_ADDRESS } from '../../../shared/constants/index.js';
+import { ZERO_ADDRESS } from '../../../utils/constants.js';
 import { GAS_LIMITS, CHAINS } from '../../constants/index.js';
-import { CHAIN_ID_MAP, PORTAL_ABI, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, } from './config.js';
+import { CHAIN_ID_MAP, PORTAL_ABI, getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, calculateBatchProfit, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA } from './config.js';
 const DEFAULT_GAS_LIMIT = 800000;
 /**
  * 私有购买（单笔）（Merkle 版本）
@@ -16,8 +16,8 @@ export async function flapPrivateBuyMerkle(params) {
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
     const originalAmountWei = ethers.parseEther(amountIn);
     // ✅ 利润提取配置
-    const extractProfit = shouldExtractProfit();
-    const { actualAmountWei, profitWei } = splitBuyAmount(originalAmountWei, extractProfit);
+    const extractProfit = shouldExtractProfit(config);
+    const { actualAmountWei, profitWei } = splitBuyAmount(originalAmountWei, extractProfit, config);
     const minAmountOut = parseMinOutput(minOutputAmount);
     const portal = new ethers.Contract(portalAddr, PORTAL_ABI, wallet);
     // ✅ 并行获取 gasPrice、nonce 和构建未签名交易
@@ -31,7 +31,7 @@ export async function flapPrivateBuyMerkle(params) {
             inputAmount: actualAmountWei,
             minOutputAmount: minAmountOut,
             permitData: '0x',
-        }, { value: actualAmountWei }),
+        }, { value: actualAmountWei })
     ]);
     const gasLimit = resolveGasLimit(config.gasLimitMultiplier);
     // ✅ 获取贿赂金额
@@ -55,7 +55,7 @@ export async function flapPrivateBuyMerkle(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId,
-            type: txType,
+            type: txType
         }));
     }
     // 买入交易
@@ -67,7 +67,7 @@ export async function flapPrivateBuyMerkle(params) {
         gasPrice,
         chainId,
         type: txType,
-        value: actualAmountWei,
+        value: actualAmountWei
     }));
     // ✅ 并行签名完成后按顺序返回
     const signedTxs = await Promise.all(signPromises);
@@ -83,7 +83,7 @@ export async function flapPrivateBuyMerkle(params) {
             gasPrice,
             chainId,
             txType,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -112,7 +112,7 @@ export async function flapPrivateSellMerkle(params) {
             inputAmount: amountWei,
             minOutputAmount: 0n, // ✅ 已移除滑点保护
             permitData: '0x',
-        }),
+        })
     ]);
     const gasLimit = resolveGasLimit(config.gasLimitMultiplier);
     const txType = getTxType(config);
@@ -120,8 +120,10 @@ export async function flapPrivateSellMerkle(params) {
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
     // ✅ 利润计算
-    const extractProfit = shouldExtractProfit();
-    const { profit: profitWei } = extractProfit && quotedOutput > 0n ? calculateProfit(quotedOutput) : { profit: 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;
@@ -139,7 +141,7 @@ export async function flapPrivateSellMerkle(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId,
-            type: txType,
+            type: txType
         }));
     }
     // 卖出交易
@@ -150,7 +152,7 @@ export async function flapPrivateSellMerkle(params) {
         gasLimit,
         gasPrice,
         chainId,
-        type: txType,
+        type: txType
     }));
     // ✅ 并行签名完成后按顺序返回
     const signedTxs = await Promise.all(signPromises);
@@ -166,7 +168,7 @@ export async function flapPrivateSellMerkle(params) {
             gasPrice,
             chainId,
             txType,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -183,15 +185,15 @@ export async function flapBatchPrivateBuyMerkle(params) {
     }
     const { chainId, provider } = createMerkleContext(chain, config);
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
-    const wallets = privateKeys.map((k) => new Wallet(k, provider));
-    const originalAmountsWei = amountsIn.map((a) => ethers.parseEther(a));
+    const wallets = privateKeys.map(k => new Wallet(k, provider));
+    const originalAmountsWei = amountsIn.map(a => ethers.parseEther(a));
     // ✅ 利润提取配置
-    const extractProfit = shouldExtractProfit();
-    const { totalProfit, remainingAmounts } = calculateBatchProfit(originalAmountsWei);
+    const extractProfit = shouldExtractProfit(config);
+    const { totalProfit, remainingAmounts } = calculateBatchProfit(originalAmountsWei, config);
     const actualAmountsWei = remainingAmounts;
     const maxFundsIndex = findMaxIndex(originalAmountsWei);
     const minOuts = resolveBatchMinOutputs(minOutputAmounts, wallets.length);
-    const portals = wallets.map((w) => new ethers.Contract(portalAddr, PORTAL_ABI, w));
+    const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     // ✅ 获取贿赂金额
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
@@ -200,14 +202,14 @@ export async function flapBatchPrivateBuyMerkle(params) {
     const [gasPrice, initialNonces, unsignedList] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         // ✅ 使用 pending nonce，避免 xLayer 等链上“已有 pending 交易”导致 nonce too low
-        Promise.all(wallets.map((w) => provider.getTransactionCount(w.address, 'pending'))),
+        Promise.all(wallets.map(w => provider.getTransactionCount(w.address, 'pending'))),
         Promise.all(portals.map((portal, i) => portal.swapExactInput.populateTransaction({
             inputToken: ZERO_ADDRESS,
             outputToken: tokenAddress,
             inputAmount: actualAmountsWei[i],
             minOutputAmount: minOuts[i],
             permitData: '0x',
-        }, { value: actualAmountsWei[i] }))),
+        }, { value: actualAmountsWei[i] })))
     ]);
     // ✅ 分配 nonces：贿赂(可选) → 买入 → 利润(可选)
     let payerNonceOffset = 0;
@@ -222,7 +224,9 @@ export async function flapBatchPrivateBuyMerkle(params) {
         }
         return n;
     });
-    const profitNonce = needProfitTx && maxFundsIndex >= 0 ? initialNonces[maxFundsIndex] + payerNonceOffset + 1 : undefined;
+    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 = [];
@@ -235,7 +239,7 @@ export async function flapBatchPrivateBuyMerkle(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId,
-            type: getTxType(config),
+            type: getTxType(config)
         });
         signedTxs.push(bribeTx);
     }
@@ -248,7 +252,7 @@ export async function flapBatchPrivateBuyMerkle(params) {
         gasPrice,
         chainId,
         config,
-        values: actualAmountsWei,
+        values: actualAmountsWei
     });
     signedTxs.push(...signedList);
     // ✅ 利润多跳转账（强制 2 跳中转）
@@ -263,7 +267,7 @@ export async function flapBatchPrivateBuyMerkle(params) {
             gasPrice,
             chainId,
             txType: getTxType(config),
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -274,39 +278,37 @@ export async function flapBatchPrivateBuyMerkle(params) {
  * 批量私有卖出（Merkle 版本）
  */
 export async function flapBatchPrivateSellMerkle(params) {
-    const { chain, privateKeys, amounts, tokenAddress, config } = params;
+    const { chain, privateKeys, amounts, tokenAddress, minOutputAmounts, config } = params;
     if (privateKeys.length !== amounts.length) {
         throw new Error('privateKeys and amounts length mismatch');
     }
     const { chainId, provider } = createMerkleContext(chain, config);
     const portalAddr = FLAP_PORTAL_ADDRESSES[chain];
-    const wallets = privateKeys.map((k) => new Wallet(k, provider));
-    const amountsWei = amounts.map((a) => ethers.parseUnits(a, 18));
+    const wallets = privateKeys.map(k => new Wallet(k, provider));
+    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));
+    const portals = wallets.map(w => new ethers.Contract(portalAddr, PORTAL_ABI, w));
     // ✅ 并行获取 gasPrice、所有 nonces、所有报价和构建未签名交易
     const [gasPrice, initialNonces, quotedOutputs, unsignedList] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         // ✅ 使用 pending nonce，避免 xLayer 等链上“已有 pending 交易”导致 nonce too low
-        Promise.all(wallets.map((w) => provider.getTransactionCount(w.address, 'pending'))),
-        Promise.all(amountsWei.map((amount) => portal.quoteExactInput
-            .staticCall({
+        Promise.all(wallets.map(w => provider.getTransactionCount(w.address, 'pending'))),
+        Promise.all(amountsWei.map(amount => portal.quoteExactInput.staticCall({
             inputToken: tokenAddress,
             outputToken: ZERO_ADDRESS,
-            inputAmount: amount,
-        })
-            .catch(() => 0n))),
+            inputAmount: amount
+        }).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',
-        }))),
+            permitData: '0x'
+        })))
     ]);
-    const extractProfit = shouldExtractProfit();
-    const { totalProfit, maxRevenueIndex } = summarizeSellProfits(quotedOutputs, extractProfit);
+    const extractProfit = shouldExtractProfit(config);
+    const { totalProfit, maxRevenueIndex } = summarizeSellProfits(quotedOutputs, extractProfit, config);
     // ✅ 获取贿赂金额
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
@@ -324,7 +326,9 @@ export async function flapBatchPrivateSellMerkle(params) {
         }
         return n;
     });
-    const profitNonce = needProfitTx && maxRevenueIndex >= 0 ? initialNonces[maxRevenueIndex] + payerNonceOffset + 1 : undefined;
+    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 = [];
@@ -337,7 +341,7 @@ export async function flapBatchPrivateSellMerkle(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId,
-            type: getTxType(config),
+            type: getTxType(config)
         });
         signedTxs.push(bribeTx);
     }
@@ -349,7 +353,7 @@ export async function flapBatchPrivateSellMerkle(params) {
         gasLimits,
         gasPrice,
         chainId,
-        config,
+        config
     });
     signedTxs.push(...signedList);
     // ✅ 利润多跳转账（强制 2 跳中转）
@@ -364,7 +368,7 @@ export async function flapBatchPrivateSellMerkle(params) {
             gasPrice,
             chainId,
             txType: getTxType(config),
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         signedTxs.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -381,27 +385,28 @@ function createMerkleContext(chain, config) {
         if (!config.customRpcUrl) {
             throw new Error(`Chain ${chain} (chainId: ${chainId}) does not support Merkle bundle service. Please provide customRpcUrl.`);
         }
+        const { JsonRpcProvider } = require('ethers');
+        // ✅ 禁用 ENS: 避免 "network does not support ENS" 错误
         return {
             chainId,
-            // ✅ 禁用 ENS: 避免 "network does not support ENS" 错误
-            provider: new JsonRpcProvider(config.customRpcUrl, { chainId, name: chain.toLowerCase(), ensAddress: undefined }),
+            provider: new JsonRpcProvider(config.customRpcUrl, { chainId, name: chain.toLowerCase(), ensAddress: undefined })
         };
     }
     const merkle = new MerkleClient({
         apiKey: config.apiKey,
         chainId: chainId, // 类型断言为 Merkle 支持的 chainId
-        customRpcUrl: config.customRpcUrl,
+        customRpcUrl: config.customRpcUrl
     });
     return {
         chainId,
-        provider: merkle.getProvider(),
+        provider: merkle.getProvider()
     };
 }
-function splitBuyAmount(amount, extractProfit) {
+function splitBuyAmount(amount, extractProfit, config) {
     if (!extractProfit) {
         return { actualAmountWei: amount, profitWei: 0n };
     }
-    const { remaining, profit } = calculateProfit(amount);
+    const { remaining, profit } = calculateProfit(amount, config);
     return { actualAmountWei: remaining, profitWei: profit };
 }
 function parseMinOutput(value) {
@@ -414,35 +419,83 @@ function resolveGasLimit(multiplier, defaultGas = DEFAULT_GAS_LIMIT) {
     const factor = multiplier ?? 1.0;
     return BigInt(Math.ceil(defaultGas * factor));
 }
+/**
+ * 追加利润多跳转账交易（强制 2 跳中转）
+ */
+async function appendSingleProfitTransfer({ extractProfit, profitWei, wallet, baseNonce, provider, gasPrice, chainId, config, signedTxs }) {
+    if (!extractProfit || profitWei === 0n) {
+        return undefined;
+    }
+    const profitHopResult = await buildProfitHopTransactions({
+        provider,
+        payerWallet: wallet,
+        profitAmount: profitWei,
+        profitRecipient: getProfitRecipient(),
+        hopCount: PROFIT_HOP_COUNT,
+        gasPrice,
+        chainId,
+        txType: getTxType(config),
+        startNonce: baseNonce + 1
+    });
+    signedTxs.push(...profitHopResult.signedTransactions);
+    return profitHopResult.hopWallets; // ✅ 返回利润多跳钱包
+}
 async function resolveSingleSellOutputs(portal, tokenAddress, amountWei, minOutputAmount) {
     if (minOutputAmount !== undefined) {
-        const minOut = typeof minOutputAmount === 'string' ? ethers.parseEther(minOutputAmount) : minOutputAmount;
+        const minOut = typeof minOutputAmount === 'string'
+            ? ethers.parseEther(minOutputAmount)
+            : minOutputAmount;
         return {
             quotedOutput: minOut,
-            minOut,
+            minOut
         };
     }
     try {
         const quotedOutput = await portal.quoteExactInput.staticCall({
             inputToken: tokenAddress,
             outputToken: ZERO_ADDRESS,
-            inputAmount: amountWei,
+            inputAmount: amountWei
         });
         return {
             quotedOutput,
-            minOut: 0n, // ✅ 已移除滑点保护：minOut 固定为 0
+            minOut: 0n // ✅ 已移除滑点保护：minOut 固定为 0
         };
     }
     catch {
         return {
             quotedOutput: 0n,
-            minOut: 0n,
+            minOut: 0n
         };
     }
 }
+/**
+ * 追加卖出利润多跳转账交易（强制 2 跳中转）
+ */
+async function appendSingleSellProfitTransfer({ extractProfit, quotedOutput, wallet, baseNonce, provider, gasPrice, chainId, config, signedTxs }) {
+    if (!extractProfit || quotedOutput <= 0n) {
+        return undefined;
+    }
+    const { profit } = calculateProfit(quotedOutput, config);
+    if (profit === 0n) {
+        return undefined;
+    }
+    const profitHopResult = await buildProfitHopTransactions({
+        provider,
+        payerWallet: wallet,
+        profitAmount: profit,
+        profitRecipient: getProfitRecipient(),
+        hopCount: PROFIT_HOP_COUNT,
+        gasPrice,
+        chainId,
+        txType: getTxType(config),
+        startNonce: baseNonce + 1
+    });
+    signedTxs.push(...profitHopResult.signedTransactions);
+    return profitHopResult.hopWallets; // ✅ 返回利润多跳钱包
+}
 function resolveBatchMinOutputs(minOutputAmounts, walletCount) {
     if (minOutputAmounts && minOutputAmounts.length === walletCount) {
-        return minOutputAmounts.map((m) => (typeof m === 'string' ? ethers.parseUnits(m, 18) : m));
+        return minOutputAmounts.map(m => typeof m === 'string' ? ethers.parseUnits(m, 18) : m);
     }
     return new Array(walletCount).fill(0n);
 }
@@ -460,9 +513,9 @@ function findMaxIndex(values) {
     }
     return maxIndex;
 }
-async function signBatchTransactions({ unsignedList, wallets, nonces, gasLimits, gasPrice, chainId, config, values, }) {
+async function signBatchTransactions({ unsignedList, wallets, nonces, gasLimits, gasPrice, chainId, config, values }) {
     return await Promise.all(unsignedList.map((unsigned, i) => {
-        const value = values ? values[i] : (unsigned.value ?? 0n);
+        const value = values ? values[i] : unsigned.value;
         return wallets[i].signTransaction({
             ...unsigned,
             from: wallets[i].address,
@@ -471,11 +524,11 @@ async function signBatchTransactions({ unsignedList, wallets, nonces, gasLimits,
             gasPrice,
             chainId,
             type: getTxType(config),
-            value,
+            value
         });
     }));
 }
-function summarizeSellProfits(quotedOutputs, extractProfit) {
+function summarizeSellProfits(quotedOutputs, extractProfit, config) {
     let totalProfit = 0n;
     let maxRevenueIndex = -1;
     let maxRevenue = 0n;
@@ -483,7 +536,7 @@ function summarizeSellProfits(quotedOutputs, extractProfit) {
         for (let i = 0; i < quotedOutputs.length; i++) {
             const quoted = quotedOutputs[i];
             if (quoted > 0n) {
-                const { profit } = calculateProfit(quoted);
+                const { profit } = calculateProfit(quoted, config);
                 totalProfit += profit;
                 if (quoted > maxRevenue) {
                     maxRevenue = quoted;

package/dist/shared/flap/portal-bundle-merkle/swap-buy-first.d.ts

@@ -1,2 +1,65 @@
-import { FlapBundleBuyFirstSignParams, FlapBuyFirstResult } from './swap-buy-first-helpers.js';
+/**
+ * Flap Protocol 内盘捆绑换手（Merkle Bundle）- 先买后卖
+ *
+ * 功能：钱包B先买入代币 → 钱包A卖出相同数量 → 原子执行
+ */
+import { CommonBundleConfig } from '../../../utils/bundle-helpers.js';
+import { FlapSignConfig } from './config.js';
+import type { GeneratedWallet } from '../../../utils/wallet.js';
+export type FlapChain = 'bsc' | 'xlayer' | 'base';
+export type UserType = 'v0' | 'v1';
+export interface FlapBuyFirstSignConfig extends FlapSignConfig {
+    reserveGasETH?: number;
+    skipQuoteOnError?: boolean;
+    userType?: UserType;
+}
+export interface FlapBuyFirstConfig extends CommonBundleConfig {
+    apiKey: string;
+    customRpcUrl?: string;
+    bundleBlockOffset?: number;
+    reserveGasETH?: number;
+    skipQuoteOnError?: boolean;
+    waitForConfirmation?: boolean;
+    waitTimeoutMs?: number;
+}
+export interface FlapBundleBuyFirstSignParams {
+    chain: FlapChain;
+    buyerPrivateKey?: string;
+    buyerPrivateKeys?: string[];
+    sellerPrivateKey?: string;
+    sellerPrivateKeys?: string[];
+    tokenAddress: string;
+    buyerFunds?: string;
+    buyerFundsPercentage?: number;
+    config: FlapBuyFirstSignConfig;
+    quoteToken?: string;
+    quoteTokenDecimals?: number;
+    buyCount?: number;
+    sellCount?: number;
+}
+export interface FlapBundleBuyFirstParams {
+    chain: FlapChain;
+    buyerPrivateKey: string;
+    sellerPrivateKey: string;
+    tokenAddress: string;
+    buyerFunds?: string;
+    buyerFundsPercentage?: number;
+    config: FlapBuyFirstConfig;
+}
+/** ✅ Flap BuyFirst 结果（简化版） */
+export type FlapBuyFirstResult = {
+    signedTransactions: string[];
+    profitHopWallets?: GeneratedWallet[];
+    metadata?: {
+        buyerAddress: string;
+        sellerAddress: string;
+        buyAmount: string;
+        sellAmount: string;
+        profitAmount?: string;
+        buyCount?: number;
+        sellCount?: number;
+        buyAmounts?: string[];
+        sellAmounts?: string[];
+    };
+};
 export declare function flapBundleBuyFirstMerkle(params: FlapBundleBuyFirstSignParams): Promise<FlapBuyFirstResult>;