four-flap-meme-sdk 1.4.62 → 1.4.64

package/dist/abis/common.d.ts

@@ -5,7 +5,7 @@
  */
 /** 完整 ERC20 ABI */
 export declare const ERC20_ABI: string[];
-/** 精简 ERC20 ABI（只有余额查询） */
+/** 精简 ERC20 ABI（余额查询 + decimals） */
 export declare const ERC20_BALANCE_ABI: string[];
 /** ERC20 授权相关 ABI */
 export declare const ERC20_ALLOWANCE_ABI: string[];

package/dist/abis/common.js

@@ -18,9 +18,10 @@ export const ERC20_ABI = [
     'function transfer(address to, uint256 amount) external returns (bool)',
     'function transferFrom(address from, address to, uint256 amount) external returns (bool)',
 ];
-/** 精简 ERC20 ABI（只有余额查询） */
+/** 精简 ERC20 ABI（余额查询 + decimals） */
 export const ERC20_BALANCE_ABI = [
     'function balanceOf(address account) external view returns (uint256)',
+    'function decimals() external view returns (uint8)',
 ];
 /** ERC20 授权相关 ABI */
 export const ERC20_ALLOWANCE_ABI = [

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

@@ -24,6 +24,8 @@ export interface FourBundleBuyFirstSignParams {
     sellerPrivateKey: string;
     tokenAddress: string;
     config: FourBuyFirstSignConfig;
+    buyCount?: number;
+    sellCount?: number;
 }
 export interface FourBundleBuyFirstParams {
     buyerPrivateKey: string;
@@ -43,6 +45,8 @@ export type FourBuyFirstResult = {
         buyAmount: string;
         sellAmount: string;
         profitAmount?: string;
+        buyCount?: number;
+        sellCount?: number;
     };
 };
 export declare function fourBundleBuyFirstMerkle(params: FourBundleBuyFirstSignParams): Promise<FourBuyFirstResult>;

package/dist/contracts/tm-bundle-merkle/swap-buy-first.js

@@ -5,7 +5,7 @@
  */
 import { ethers, Contract, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../utils/bundle-helpers.js';
-import { ADDRESSES, PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA } from '../../utils/constants.js';
+import { ADDRESSES, BLOCKRAZOR_BUILDER_EOA } from '../../utils/constants.js';
 import { TM_ABI, HELPER3_ABI, TM_ADDRESS } from './swap-internal.js';
 import { getTxType, getGasPriceConfig, getProfitRecipient, getBribeAmount } from './config.js';
 import { trySell } from '../tm.js';
@@ -17,8 +17,61 @@ function getGasLimit(config, defaultGas = 800000) {
     const multiplier = config.gasLimitMultiplier ?? 1.0;
     return BigInt(Math.ceil(defaultGas * multiplier));
 }
+// ==================== 多笔买卖常量 ====================
+/** 最大 Bundle 签名数 */
+const MAX_BUNDLE_SIGNATURES = 50;
+/** 贿赂交易数 */
+const BRIBE_TX_COUNT = 1;
+/** 利润中转交易数（支付者 1 笔 + 中转钱包 PROFIT_HOP_COUNT 笔 + 最终接收 1 笔） */
+const PROFIT_TX_COUNT = PROFIT_HOP_COUNT + 2; // 2 + 2 = 4
+/** 最大买卖交易数 */
+const MAX_SWAP_TX_COUNT = MAX_BUNDLE_SIGNATURES - BRIBE_TX_COUNT - PROFIT_TX_COUNT; // 50 - 1 - 4 = 45
+/** 每笔交易利润比例（基点）：3 bps = 0.03% = 万分之三 */
+const PROFIT_RATE_PER_TX_BPS = 3;
+/**
+ * 验证买卖笔数
+ */
+function validateSwapCounts(buyCount, sellCount) {
+    if (buyCount < 1) {
+        throw new Error(`买入笔数必须至少为 1，当前为 ${buyCount}`);
+    }
+    if (sellCount < 1) {
+        throw new Error(`卖出笔数必须至少为 1，当前为 ${sellCount}`);
+    }
+    const totalSwaps = buyCount + sellCount;
+    if (totalSwaps > MAX_SWAP_TX_COUNT) {
+        throw new Error(`买卖笔数总和 (${totalSwaps}) 超出限制 (${MAX_SWAP_TX_COUNT})，` +
+            `最大签名数为 ${MAX_BUNDLE_SIGNATURES}（${BRIBE_TX_COUNT} 贿赂 + ${PROFIT_TX_COUNT} 利润 + ${MAX_SWAP_TX_COUNT} 买卖）`);
+    }
+}
+/**
+ * 将金额均匀拆分成多份
+ */
+function splitAmount(totalAmount, count) {
+    if (count <= 0) {
+        throw new Error('拆分份数必须大于 0');
+    }
+    if (count === 1) {
+        return [totalAmount];
+    }
+    const baseAmount = totalAmount / BigInt(count);
+    const remainder = totalAmount % BigInt(count);
+    const amounts = [];
+    for (let i = 0; i < count - 1; i++) {
+        amounts.push(baseAmount);
+    }
+    amounts.push(baseAmount + remainder);
+    return amounts;
+}
 export async function fourBundleBuyFirstMerkle(params) {
-    const { buyerPrivateKey, buyerFunds, buyerFundsPercentage, sellerPrivateKey, tokenAddress, config } = params;
+    const { buyerPrivateKey, buyerFunds, buyerFundsPercentage, sellerPrivateKey, tokenAddress, config, buyCount: _buyCount, sellCount: _sellCount } = params;
+    // ✅ 解析并验证买卖笔数
+    const buyCount = _buyCount ?? 1;
+    const sellCount = _sellCount ?? 1;
+    validateSwapCounts(buyCount, sellCount);
+    // ✅ 计算利润比例：每笔万分之3
+    const totalTxCount = buyCount + sellCount;
+    const profitRateBps = PROFIT_RATE_PER_TX_BPS * totalTxCount;
     const chainIdNum = config.chainId ?? 56;
     const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
         chainId: chainIdNum,
@@ -75,115 +128,82 @@ export async function fourBundleBuyFirstMerkle(params) {
     // ✅ 优化：第三批并行 - trySell、构建交易、获取 nonces
     const tmBuyer = new Contract(TM_ADDRESS, TM_ABI, buyer);
     const tmSeller = new Contract(TM_ADDRESS, TM_ABI, seller);
+    // ✅ 拆分买入和卖出金额
+    const buyAmountsWei = splitAmount(buyerFundsWei, buyCount);
+    const sellAmountsWei = splitAmount(sellAmountWei, sellCount);
     // 预先规划 nonces
     const extractProfit = true;
-    const profitRateBps = PROFIT_CONFIG.RATE_BPS_SWAP; // 万分之六
     // ✅ 获取贿赂金额
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
-    // 计算需要的 nonce 数量
-    let buyerNonceCount = 1; // 买入交易
-    let sellerNonceCount = 1; // 卖出交易
-    if (needBribeTx)
-        sellerNonceCount++; // 贿赂交易（由卖方发送）
-    if (extractProfit)
-        sellerNonceCount++; // 利润交易
-    // ✅ 优化：使用批量 nonce 获取（单次网络往返）
-    const getNoncesPromise = sameAddress
-        ? nonceManager.getNextNonceBatch(seller, buyerNonceCount + sellerNonceCount)
-            .then(nonces => ({ buyerNonces: [], sellerNonces: nonces }))
-        : nonceManager.getNextNoncesForWallets([buyer, seller])
-            .then(initialNonces => ({
-            // buyer 只需要 1 个 nonce
-            buyerNonces: [initialNonces[0]],
-            // seller 需要 sellerNonceCount 个连续 nonce，从初始 nonce 开始
-            sellerNonces: Array.from({ length: sellerNonceCount }, (_, i) => initialNonces[1] + i)
-        }));
-    const [sellResult, buyUnsigned, sellUnsigned, noncesResult] = await Promise.all([
+    // ✅ 构建多笔买入和卖出交易
+    const buyUnsignedPromises = buyAmountsWei.map(amount => tmBuyer.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyer.address, amount, 0n, { value: amount }));
+    const sellUnsignedPromises = sellAmountsWei.map(amount => tmSeller.sellToken.populateTransaction(0n, tokenAddress, amount, 0n));
+    // ✅ 规划多笔交易 nonce
+    const multiNoncePlan = await planMultiNonces({
+        buyer,
+        seller,
+        buyCount,
+        sellCount,
+        extractProfit,
+        needBribeTx,
+        sameAddress,
+        nonceManager
+    });
+    const [sellResult, buyUnsignedArray, sellUnsignedArray] = await Promise.all([
         trySell('BSC', config.rpcUrl, tokenAddress, sellAmountWei),
-        tmBuyer.buyTokenAMAP.populateTransaction(0n, tokenAddress, buyer.address, buyerFundsWei, 0n, { value: buyerFundsWei }),
-        tmSeller.sellToken.populateTransaction(0n, tokenAddress, sellAmountWei, 0n),
-        getNoncesPromise
+        Promise.all(buyUnsignedPromises),
+        Promise.all(sellUnsignedPromises)
     ]);
-    const { buyerNonces, sellerNonces } = noncesResult;
     const estimatedSellFunds = sellResult.funds;
     const profitAmount = extractProfit ? (estimatedSellFunds * BigInt(profitRateBps)) / 10000n : 0n;
-    // 分配 nonces
-    let buyerNonce;
-    let sellerNonce;
-    let bribeNonce;
-    let profitNonce;
-    if (sameAddress) {
-        let idx = 0;
-        if (needBribeTx)
-            bribeNonce = sellerNonces[idx++];
-        buyerNonce = sellerNonces[idx++];
-        sellerNonce = sellerNonces[idx++];
-        if (extractProfit)
-            profitNonce = sellerNonces[idx];
-    }
-    else {
-        buyerNonce = buyerNonces[0];
-        let idx = 0;
-        if (needBribeTx)
-            bribeNonce = sellerNonces[idx++];
-        sellerNonce = sellerNonces[idx++];
-        if (extractProfit)
-            profitNonce = sellerNonces[idx];
-    }
-    // ✅ 并行签名所有交易
-    const signPromises = [];
     // ✅ 贿赂交易放在首位
     let bribeTx = null;
-    if (needBribeTx && bribeNonce !== undefined) {
-        signPromises.push(seller.signTransaction({
+    if (needBribeTx && multiNoncePlan.bribeNonce !== undefined) {
+        bribeTx = await seller.signTransaction({
             to: BLOCKRAZOR_BUILDER_EOA,
             value: bribeAmount,
-            nonce: bribeNonce,
+            nonce: multiNoncePlan.bribeNonce,
             gasPrice,
             gasLimit: 21000n,
             chainId: chainIdNum,
             type: txType
-        }));
+        });
     }
-    // 买入和卖出交易
-    signPromises.push(buyer.signTransaction({
-        ...buyUnsigned,
+    // ✅ 并行签名所有买入和卖出交易
+    const buySignPromises = buyUnsignedArray.map((unsigned, i) => buyer.signTransaction({
+        ...unsigned,
         from: buyer.address,
-        nonce: buyerNonce,
+        nonce: multiNoncePlan.buyerNonces[i],
         gasLimit: finalGasLimit,
         gasPrice,
         chainId: chainIdNum,
         type: txType,
-        value: buyerFundsWei
-    }), 
-    // ✅ 卖出交易 value 必须为 0，不能发送原生代币
-    seller.signTransaction({
-        ...sellUnsigned,
+        value: buyAmountsWei[i]
+    }));
+    const sellSignPromises = sellUnsignedArray.map((unsigned, i) => seller.signTransaction({
+        ...unsigned,
         from: seller.address,
-        nonce: sellerNonce,
+        nonce: multiNoncePlan.sellerNonces[i],
         gasLimit: finalGasLimit,
         gasPrice,
         chainId: chainIdNum,
         type: txType,
-        value: 0n // ✅ 卖出交易不发送原生代币
+        value: 0n
     }));
-    const signedTxs = await Promise.all(signPromises);
-    // 解析签名结果
-    let idx = 0;
-    if (needBribeTx)
-        bribeTx = signedTxs[idx++];
-    const signedBuy = signedTxs[idx++];
-    const signedSell = signedTxs[idx++];
+    const [signedBuys, signedSells] = await Promise.all([
+        Promise.all(buySignPromises),
+        Promise.all(sellSignPromises)
+    ]);
     nonceManager.clearTemp();
-    // ✅ 组装交易列表：贿赂 → 买入 → 卖出
+    // ✅ 组装交易列表：贿赂 → 买入(多笔) → 卖出(多笔)
     const allTransactions = [];
     if (bribeTx)
         allTransactions.push(bribeTx);
-    allTransactions.push(signedBuy, signedSell);
+    allTransactions.push(...signedBuys, ...signedSells);
     // ✅ 利润多跳转账（强制 2 跳中转）
     let profitHopWallets;
-    if (extractProfit && profitAmount > 0n && profitNonce !== undefined) {
+    if (extractProfit && profitAmount > 0n && multiNoncePlan.profitNonce !== undefined) {
         const profitHopResult = await buildProfitHopTransactions({
             provider,
             payerWallet: seller,
@@ -193,7 +213,7 @@ export async function fourBundleBuyFirstMerkle(params) {
             gasPrice,
             chainId: chainIdNum,
             txType,
-            startNonce: profitNonce
+            startNonce: multiNoncePlan.profitNonce
         });
         allTransactions.push(...profitHopResult.signedTransactions);
         profitHopWallets = profitHopResult.hopWallets; // ✅ 收集利润多跳钱包
@@ -206,7 +226,42 @@ export async function fourBundleBuyFirstMerkle(params) {
             sellerAddress: seller.address,
             buyAmount: ethers.formatEther(buyerFundsWei),
             sellAmount: ethers.formatUnits(sellAmountWei, decimals),
-            profitAmount: extractProfit ? ethers.formatEther(profitAmount) : undefined
+            profitAmount: extractProfit ? ethers.formatEther(profitAmount) : undefined,
+            // ✅ 返回多笔买卖信息
+            buyCount,
+            sellCount
         }
     };
 }
+/**
+ * ✅ 规划多笔交易 nonce
+ * 交易顺序：贿赂 → 买入(多笔) → 卖出(多笔) → 利润
+ */
+async function planMultiNonces({ buyer, seller, buyCount, sellCount, extractProfit, needBribeTx, sameAddress, nonceManager }) {
+    const profitNonceCount = extractProfit ? 1 : 0;
+    if (sameAddress) {
+        const bribeTxCount = needBribeTx ? 1 : 0;
+        const totalTxCount = bribeTxCount + buyCount + sellCount + profitNonceCount;
+        const nonces = await nonceManager.getNextNonceBatch(buyer, totalTxCount);
+        let idx = 0;
+        const bribeNonce = needBribeTx ? nonces[idx++] : undefined;
+        const buyerNonces = nonces.slice(idx, idx + buyCount);
+        idx += buyCount;
+        const sellerNonces = nonces.slice(idx, idx + sellCount);
+        idx += sellCount;
+        const profitNonce = extractProfit ? nonces[idx] : undefined;
+        return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
+    }
+    const bribeTxCount = needBribeTx ? 1 : 0;
+    const sellerTxCount = bribeTxCount + sellCount + profitNonceCount;
+    const [buyerNonces, sellerNoncesAll] = await Promise.all([
+        nonceManager.getNextNonceBatch(buyer, buyCount),
+        nonceManager.getNextNonceBatch(seller, sellerTxCount)
+    ]);
+    let idx = 0;
+    const bribeNonce = needBribeTx ? sellerNoncesAll[idx++] : undefined;
+    const sellerNonces = sellerNoncesAll.slice(idx, idx + sellCount);
+    idx += sellCount;
+    const profitNonce = extractProfit ? sellerNoncesAll[idx] : undefined;
+    return { buyerNonces, sellerNonces, bribeNonce, profitNonce };
+}

package/dist/flap/portal-bundle-merkle/encryption.d.ts

@@ -0,0 +1,16 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
+/**
+ * 验证公钥格式（Base64）
+ */
+export declare function validatePublicKey(publicKeyBase64: string): boolean;

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

@@ -0,0 +1,146 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 获取全局 crypto 对象（最简单直接的方式）
+ */
+function getCryptoAPI() {
+    // 尝试所有可能的全局对象，优先浏览器环境
+    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
+        (typeof self !== 'undefined' && self.crypto) ||
+        (typeof global !== 'undefined' && global.crypto) ||
+        (typeof globalThis !== 'undefined' && globalThis.crypto);
+    if (!cryptoObj) {
+        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
+            '请确保在 HTTPS 或 localhost 下运行');
+    }
+    return cryptoObj;
+}
+/**
+ * 获取 SubtleCrypto（用于加密操作）
+ */
+function getSubtleCrypto() {
+    const crypto = getCryptoAPI();
+    if (!crypto.subtle) {
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
+        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
+            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
+            '3) 不在无痕/隐私浏览模式下');
+    }
+    return crypto.subtle;
+}
+/**
+ * Base64 转 ArrayBuffer（优先使用浏览器 API）
+ */
+function base64ToArrayBuffer(base64) {
+    // 浏览器环境（优先）
+    if (typeof atob !== 'undefined') {
+        const binaryString = atob(base64);
+        const bytes = new Uint8Array(binaryString.length);
+        for (let i = 0; i < binaryString.length; i++) {
+            bytes[i] = binaryString.charCodeAt(i);
+        }
+        return bytes.buffer;
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(base64, 'base64').buffer;
+    }
+    throw new Error('❌ Base64 解码不可用');
+}
+/**
+ * ArrayBuffer 转 Base64（优先使用浏览器 API）
+ */
+function arrayBufferToBase64(buffer) {
+    // 浏览器环境（优先）
+    if (typeof btoa !== 'undefined') {
+        const bytes = new Uint8Array(buffer);
+        let binary = '';
+        for (let i = 0; i < bytes.length; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(buffer).toString('base64');
+    }
+    throw new Error('❌ Base64 编码不可用');
+}
+/**
+ * 生成随机 Hex 字符串
+ */
+function randomHex(length) {
+    const crypto = getCryptoAPI();
+    const array = new Uint8Array(length);
+    crypto.getRandomValues(array);
+    return Array.from(array)
+        .map(b => b.toString(16).padStart(2, '0'))
+        .join('');
+}
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
+    try {
+        // 0. 获取 SubtleCrypto 和 Crypto API
+        const subtle = getSubtleCrypto();
+        const crypto = getCryptoAPI();
+        // 1. 准备数据
+        const payload = {
+            signedTransactions,
+            timestamp: Date.now(),
+            nonce: randomHex(8)
+        };
+        const plaintext = JSON.stringify(payload);
+        // 2. 生成临时 ECDH 密钥对
+        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
+        // 3. 导入服务器公钥
+        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
+        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
+        // 4. 派生共享密钥（AES-256）
+        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
+        // 5. AES-GCM 加密
+        const iv = crypto.getRandomValues(new Uint8Array(12));
+        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
+        // 6. 导出临时公钥
+        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
+        // 7. 返回加密包（JSON 格式）
+        return JSON.stringify({
+            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
+            i: arrayBufferToBase64(iv.buffer), // IV
+            d: arrayBufferToBase64(encrypted) // 密文
+        });
+    }
+    catch (error) {
+        throw new Error(`加密失败: ${error?.message || String(error)}`);
+    }
+}
+/**
+ * 验证公钥格式（Base64）
+ */
+export function validatePublicKey(publicKeyBase64) {
+    try {
+        if (!publicKeyBase64)
+            return false;
+        // Base64 字符集验证
+        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
+            return false;
+        // ECDH P-256 公钥固定长度 65 字节（未压缩）
+        // Base64 编码后约 88 字符
+        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
+            return false;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

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

@@ -30,6 +30,8 @@ export interface FlapBundleBuyFirstSignParams {
     config: FlapBuyFirstSignConfig;
     quoteToken?: string;
     quoteTokenDecimals?: number;
+    buyCount?: number;
+    sellCount?: number;
 }
 export interface FlapBundleBuyFirstParams {
     chain: FlapChain;
@@ -50,6 +52,8 @@ export type FlapBuyFirstResult = {
         buyAmount: string;
         sellAmount: string;
         profitAmount?: string;
+        buyCount?: number;
+        sellCount?: number;
     };
 };
 export declare function flapBundleBuyFirstMerkle(params: FlapBundleBuyFirstSignParams): Promise<FlapBuyFirstResult>;