four-flap-meme-sdk 4.3.9 → 4.3.11

package/dist/bundle/four-meme/core/sell-flow.js

@@ -13,6 +13,7 @@ import { trySell } from '../../../domains/four/contracts/tm.js';
 import { createChainContext, createWallets } from '../core-helpers.js';
 import { TokenManagerHelper3 as Helper3Abi } from '../../../abis/contracts/index.js';
 import { TM2_ABI, MULTICALL3_ADDRESS } from './constants.js';
+import { prefixSumAmounts, sequentialFundsFromPrefixQuotes } from '../sequential-sell-quote.js';
 export async function batchSellWithBundleMerkle(params) {
     const { privateKeys, sellAmounts, tokenAddress, minOutputAmounts, config } = params;
     if (privateKeys.length === 0 || sellAmounts.length !== privateKeys.length) {
@@ -54,7 +55,7 @@ async function executeSellFlow(options) {
     // ✅ 获取贿赂金额
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
-    // ✅ 优化：并行执行 resolveSellOutputs、ensureSellerBalances 和批量获取 nonces（已移除授权检查）
+    // 报价 / 余额 / nonce 并行；多笔卖出的 trySell 按前缀顺序拆，避免同一池子被加总多次。
     const [sellOutputs, , nonces] = await Promise.all([
         resolveSellOutputs({
             minOutputAmounts,
@@ -114,48 +115,42 @@ async function executeSellFlow(options) {
     });
     return { signedTxs, profitHopWallets }; // ✅ 返回利润多跳钱包
 }
-/**
- * ✅ 使用 Multicall3 批量获取卖出报价（单次 RPC）
- * 比 Promise.all 更高效，N 个报价只需 1 次网络请求
- */
 async function resolveSellOutputs(params) {
     const { minOutputAmounts, sellers, amountsWei, rpcUrl, tokenAddress } = params;
-    // 如果已提供 minOutputAmounts，直接使用，跳过报价查询
     if (minOutputAmounts && minOutputAmounts.length === sellers.length) {
         const minOuts = minOutputAmounts.map((m) => (typeof m === 'string' ? ethers.parseEther(m) : m));
         const quotedOutputs = minOuts.map((value) => reverseSlippageBps(value));
         return { minOuts, quotedOutputs };
     }
-    // 如果只有 1 个，直接调用（避免 multicall 开销）
-    if (amountsWei.length === 1) {
+    const prefixes = prefixSumAmounts(amountsWei);
+    if (prefixes.length === 1) {
+        const only = prefixes[0];
+        if (only === undefined)
+            return { minOuts: [0n], quotedOutputs: [0n] };
         try {
-            const result = await trySell('BSC', rpcUrl, tokenAddress, amountsWei[0]);
-            const quotedOutputs = [result.funds];
-            const minOuts = [applySlippageBps(result.funds)];
-            return { minOuts, quotedOutputs };
+            const result = await trySell('BSC', rpcUrl, tokenAddress, only);
+            const quotedOutputs = sequentialFundsFromPrefixQuotes([result.funds]);
+            return { minOuts: quotedOutputs.map((q) => applySlippageBps(q)), quotedOutputs };
         }
         catch {
             return { minOuts: [0n], quotedOutputs: [0n] };
         }
     }
-    // ✅ 使用 Multicall3 批量获取报价
     const provider = createSignProvider(rpcUrl, CHAINS.BSC.chainId, 'BSC');
     const helper3Address = ADDRESSES.BSC.TokenManagerHelper3;
     const helper3Iface = new Interface(Helper3Abi);
     const multicall = new Contract(MULTICALL3_ADDRESS, MULTICALL3_ABI, provider);
-    // 构建批量调用
-    const calls = amountsWei.map((amount) => ({
+    const calls = prefixes.map((amount) => ({
         target: helper3Address,
-        allowFailure: true, // 允许单个失败
+        allowFailure: true,
         callData: helper3Iface.encodeFunctionData('trySell', [tokenAddress, amount]),
     }));
     try {
         const results = await multicall.aggregate3.staticCall(calls);
-        const quotedOutputs = results.map((r) => {
+        const prefixFunds = results.map((r) => {
             if (r.success && r.returnData && r.returnData !== '0x') {
                 try {
                     const decoded = helper3Iface.decodeFunctionResult('trySell', r.returnData);
-                    // trySell 返回 (tokenManager, quote, funds, fee)，我们需要 funds
                     return BigInt(decoded.funds);
                 }
                 catch {
@@ -164,12 +159,11 @@ async function resolveSellOutputs(params) {
             }
             return 0n;
         });
-        const minOuts = quotedOutputs.map((q) => applySlippageBps(q));
-        return { minOuts, quotedOutputs };
+        const quotedOutputs = sequentialFundsFromPrefixQuotes(prefixFunds);
+        return { minOuts: quotedOutputs.map((q) => applySlippageBps(q)), quotedOutputs };
     }
     catch {
-        // Multicall 失败，回退到并行调用
-        const quotedOutputs = await Promise.all(amountsWei.map(async (amount) => {
+        const prefixFunds = await Promise.all(prefixes.map(async (amount) => {
             try {
                 const result = await trySell('BSC', rpcUrl, tokenAddress, amount);
                 return result.funds;
@@ -178,8 +172,8 @@ async function resolveSellOutputs(params) {
                 return 0n;
             }
         }));
-        const minOuts = quotedOutputs.map((q) => applySlippageBps(q));
-        return { minOuts, quotedOutputs };
+        const quotedOutputs = sequentialFundsFromPrefixQuotes(prefixFunds);
+        return { minOuts: quotedOutputs.map((q) => applySlippageBps(q)), quotedOutputs };
     }
 }
 async function ensureSellerBalances(params) {

package/dist/bundle/four-meme/private/sell.js

@@ -5,6 +5,7 @@ import { ethers, Wallet } from 'ethers';
 import { getGasLimit } from '../../../core/gas/bundle-gas.js';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
 import { ADDRESSES, BLOCKRAZOR_BUILDER_EOA, CHAINS, applySlippageBps, reverseSlippageBps } from '../../../core/constants/index.js';
+import { prefixSumAmounts, sequentialFundsFromPrefixQuotes } from '../sequential-sell-quote.js';
 import { TM2_ABI } from '../../../abis/common.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, calculateProfit, getProfitRecipient, getBribeAmount, } from '../../config-helpers.js';
 import { trySell } from '../../../domains/four/contracts/tm.js';
@@ -114,24 +115,26 @@ export async function fourBatchPrivateSellMerkle(params) {
     const wallets = privateKeys.map((k) => new Wallet(k, provider));
     const amountsWei = amounts.map((a) => ethers.parseUnits(a, 18));
     const rpcUrl = config.rpcUrl;
-    // ✅ 优化：并行获取 gasPrice 和 quotedOutputs（已移除授权和余额检查）
     const [gasPrice, quotedOutputs] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        // 获取预期收益（用于计算利润）
         minFundsEach !== undefined
             ? Promise.resolve((() => {
                 const minOutWei = typeof minFundsEach === 'string' ? ethers.parseEther(minFundsEach) : minFundsEach;
                 return new Array(wallets.length).fill(reverseSlippageBps(minOutWei));
             })())
-            : Promise.all(amountsWei.map(async (amount) => {
-                try {
-                    const result = await trySell('BSC', rpcUrl, tokenAddress, amount);
-                    return result.funds;
-                }
-                catch {
-                    return 0n;
-                }
-            })),
+            : (async () => {
+                const prefixes = prefixSumAmounts(amountsWei);
+                const prefixFunds = await Promise.all(prefixes.map(async (amount) => {
+                    try {
+                        const result = await trySell('BSC', rpcUrl, tokenAddress, amount);
+                        return result.funds;
+                    }
+                    catch {
+                        return 0n;
+                    }
+                }));
+                return sequentialFundsFromPrefixQuotes(prefixFunds);
+            })(),
     ]);
     // 报价 × (1 - 100bps)
     const minOuts = quotedOutputs.map((q) => applySlippageBps(q));

package/dist/bundle/four-meme/sequential-sell-quote.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 内盘多笔卖出在同一 bundle 里是顺序成交的。
+ * Helper3.trySell(amount) 只反映「当前池子一次性卖掉 amount」，
+ * 五笔并行报价会把同一份 BNB 加五次，后面几笔 minFunds 必然在模拟里回滚。
+ * 用前缀数量报价：第 i 笔应得 ≈ trySell(sum 0..i) - trySell(sum 0..i-1)。
+ */
+export declare function prefixSumAmounts(amounts: bigint[]): bigint[];
+export declare function sequentialFundsFromPrefixQuotes(prefixFunds: bigint[]): bigint[];

package/dist/bundle/four-meme/sequential-sell-quote.js

@@ -0,0 +1,29 @@
+/**
+ * 内盘多笔卖出在同一 bundle 里是顺序成交的。
+ * Helper3.trySell(amount) 只反映「当前池子一次性卖掉 amount」，
+ * 五笔并行报价会把同一份 BNB 加五次，后面几笔 minFunds 必然在模拟里回滚。
+ * 用前缀数量报价：第 i 笔应得 ≈ trySell(sum 0..i) - trySell(sum 0..i-1)。
+ */
+export function prefixSumAmounts(amounts) {
+    const prefixes = [];
+    let sum = 0n;
+    for (const amount of amounts) {
+        sum += amount > 0n ? amount : 0n;
+        prefixes.push(sum);
+    }
+    return prefixes;
+}
+export function sequentialFundsFromPrefixQuotes(prefixFunds) {
+    const sequential = [];
+    let prev = 0n;
+    for (const funds of prefixFunds) {
+        const quoted = funds > 0n ? funds : 0n;
+        if (quoted <= prev) {
+            sequential.push(0n);
+            continue;
+        }
+        sequential.push(quoted - prev);
+        prev = quoted;
+    }
+    return sequential;
+}

package/dist/core/clients/four-client-fallback.test.js

@@ -10,7 +10,7 @@ describe('FourClient private API rate-limit fallback', () => {
         vi.stubGlobal('fetch', vi.fn(async (input) => {
             const url = String(input);
             calls.push(url);
-            if (url.includes('bscfourapi.emit.tools')) {
+            if (url.includes('bscfourapi.emit.tools') || url.includes('api.emit.tools')) {
                 return new Response(JSON.stringify({ code: -1013, msg: 'Too many requests, banned for 15 minutes' }), {
                     status: 429,
                 });
@@ -49,6 +49,25 @@ describe('FourClient private API rate-limit fallback', () => {
         expect(calls.some((url) => url.includes('example.com'))).toBe(true);
         expect(calls.some((url) => url.includes('bscfourapi.emit.tools'))).toBe(true);
     });
+    it('retries generateNonce on EC2 after Cloudflare proxies are banned', async () => {
+        const calls = [];
+        vi.stubGlobal('fetch', vi.fn(async (input) => {
+            const url = typeof input === 'string' ? input : input instanceof URL ? input.href : String(input);
+            calls.push(url);
+            if (url.includes('api.emit.tools')) {
+                return new Response(JSON.stringify({ code: 0, data: 'nonce-ec2' }));
+            }
+            return new Response(JSON.stringify({ code: -1013, msg: 'Too many requests, banned for 15 minutes' }), {
+                status: 429,
+            });
+        }));
+        await expect(new FourClient().generateNonce({
+            accountAddress: `0x${'11'.repeat(20)}`,
+            verifyType: 'LOGIN',
+            networkCode: 'BSC',
+        })).resolves.toBe('nonce-ec2');
+        expect(calls.some((url) => url.includes('api.emit.tools'))).toBe(true);
+    });
     it('retries generateNonce when the proxy returns HTML', async () => {
         vi.stubGlobal('fetch', vi.fn(async (input) => {
             const url = String(input);
@@ -58,6 +77,11 @@ describe('FourClient private API rate-limit fallback', () => {
                     headers: { 'Content-Type': 'text/html' },
                 });
             }
+            if (url.includes('api.emit.tools')) {
+                return new Response(JSON.stringify({ code: -1013, msg: 'Too many requests, banned for 15 minutes' }), {
+                    status: 429,
+                });
+            }
             return new Response(JSON.stringify({ code: 0, data: 'nonce-2' }));
         }));
         await expect(new FourClient().generateNonce({

package/dist/core/clients/four.js

@@ -109,8 +109,10 @@ async function hashBlob(blob) {
 }
 /** Four.meme 限流：-1038 每日上传配额，-1013 15 分钟封禁 */
 const RATE_LIMIT_CODES = new Set([-1038, -1013]);
-/** Cloudflare Worker 代理（独立出口 IP，主线路被封时换这条） */
+/** Cloudflare Worker 代理（与 Pages 同源反代同属 CF 出口，可能连坐） */
 const FOUR_MEME_PROXY_API = 'https://bscfourapi.emit.tools';
+/** emit-api EC2 反代（新加坡出口，CF 被 -1013 后换这条） */
+const FOUR_MEME_EC2_PROXY_API = 'https://api.emit.tools/v1/four-meme-api';
 /**
  * Four.meme 官方 API。浏览器走这条才是用户自己的 IP，不会被共用代理连坐封禁。
  * 官网 CORS 允许 Authorization，不允许 meme-web-access；浏览器直连时改用前者。
@@ -121,7 +123,13 @@ export class FourClient {
     uploadUrls;
     constructor(cfg) {
         this.baseUrl = cfg?.baseUrl || FOUR_MEME_PROXY_API;
-        const urls = [this.baseUrl, ...(cfg?.uploadFallbackUrls || []), FOUR_MEME_PROXY_API, FOUR_MEME_OFFICIAL_API];
+        const urls = [
+            this.baseUrl,
+            ...(cfg?.uploadFallbackUrls || []),
+            FOUR_MEME_PROXY_API,
+            FOUR_MEME_EC2_PROXY_API,
+            FOUR_MEME_OFFICIAL_API,
+        ];
         // 浏览器先打官网（用户 IP）；Node 仍先走调用方传入的代理
         this.uploadUrls = this.isBrowserEnv()
             ? [...new Set([FOUR_MEME_OFFICIAL_API, ...urls])]

package/package.json

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