four-flap-meme-sdk 4.3.1 → 4.3.2

package/dist/chains/bsc/pancake/bundle-buy-first-multi-wallet.js

@@ -57,7 +57,7 @@ export async function pancakeBundleBuyFirstMultiWallet(params) {
     const deadline = BigInt(getDeadline());
     const bribeAmount = config.bribeAmount && config.bribeAmount > 0 ? ethers.parseEther(String(config.bribeAmount)) : 0n;
     const needBribeTx = bribeAmount > 0n;
-    // ✅ 第一批并行：报价 + Gas价格 + 所有钱包 nonces
+    // 报价 + Gas 并行；nonce 必须在报价之后再取，避免 quote 期间链上 nonce 已前进
     // 预先计算所有唯一钱包地址（去重）
     const allWallets = [...sellers, ...buyers];
     const uniqueWallets = allWallets.filter((w, i) => {
@@ -65,7 +65,7 @@ export async function pancakeBundleBuyFirstMultiWallet(params) {
         const firstIdx = allWallets.findIndex((x) => x.address.toLowerCase() === addr);
         return firstIdx === i;
     });
-    const [quoteResult, gasPrice, noncesArray] = await Promise.all([
+    const [quoteResult, gasPrice] = await Promise.all([
         quoteTokenOutput({
             routeParams,
             buyerFundsWei: totalFundsWei,
@@ -73,13 +73,7 @@ export async function pancakeBundleBuyFirstMultiWallet(params) {
             v2RouterOverride: config.v2RouterAddress,
         }),
         getGasPrice(context.provider, config),
-        nonceManager.getNextNoncesForWallets(uniqueWallets),
     ]);
-    // 构建 nonces Map
-    const noncesMap = new Map();
-    uniqueWallets.forEach((wallet, i) => {
-        noncesMap.set(wallet.address.toLowerCase(), noncesArray[i]);
-    });
     // ✅ 将总金额平均分配给买方
     const buyAmountsWei = splitAmount(totalFundsWei, buyCount);
     // ✅ 税币支持：买入时会被扣税，实际获得的代币 = 报价 * (1 - 税率)
@@ -102,6 +96,11 @@ export async function pancakeBundleBuyFirstMultiWallet(params) {
         const fee = routeParams.routeType === 'v3-single' ? routeParams.v3Fee : undefined;
         profitAmount = await quoteRoundTripProfitToNative(context.provider, quoteToken, totalFundsWei, totalFundsWei, 'BSC', version, fee, config.v2RouterAddress);
     }
+    const noncesArray = await nonceManager.getNextNoncesForWallets(uniqueWallets);
+    const noncesMap = new Map();
+    uniqueWallets.forEach((wallet, i) => {
+        noncesMap.set(wallet.address.toLowerCase(), noncesArray[i]);
+    });
     // ✅ 第三批并行：构建并签名所有交易
     const allTransactions = [];
     // 1. 贿赂交易（由主卖方支付）- 先处理以确定 nonce 偏移

package/dist/core/nonce/nonce-manager.d.ts

@@ -11,6 +11,7 @@ export declare class NonceManager {
     constructor(provider: JsonRpcProvider);
     private withAddressLock;
     private getChainId;
+    private readOnchainNonce;
     getNextNonce(wallet: Wallet | string): Promise<number>;
     getNextNonceBatch(wallet: Wallet | string, count: number): Promise<number[]>;
     clearTemp(): void;

package/dist/core/nonce/nonce-manager.js

@@ -77,6 +77,13 @@ export class NonceManager {
         }
         return this.chainIdPromise;
     }
+    async readOnchainNonce(address) {
+        const [latest, pending] = await Promise.all([
+            this.provider.getTransactionCount(address, 'latest'),
+            this.provider.getTransactionCount(address, 'pending'),
+        ]);
+        return Math.max(Number(latest) || 0, Number(pending) || 0);
+    }
     async getNextNonce(wallet) {
         const address = typeof wallet === 'string' ? wallet : wallet.address;
         const key = address.toLowerCase();
@@ -90,7 +97,7 @@ export class NonceManager {
                     setGlobalNextNonce(chainId, key, cachedNonce + 1);
                 return cachedNonce;
             }
-            const onchainNonce = await this.provider.getTransactionCount(address, 'pending');
+            const onchainNonce = await this.readOnchainNonce(address);
             let effectiveNonce = onchainNonce;
             if (flaky) {
                 const globalNext = getGlobalNextNonce(chainId, key);
@@ -118,7 +125,7 @@ export class NonceManager {
                 startNonce = cachedNonce;
             }
             else {
-                startNonce = await this.provider.getTransactionCount(address, 'pending');
+                startNonce = await this.readOnchainNonce(address);
             }
             if (flaky) {
                 const globalNext = getGlobalNextNonce(chainId, key);
@@ -170,23 +177,30 @@ export class NonceManager {
             let queryResults;
             const uniqueQueries = Array.from(needQueryByKey.values()).map((entries) => entries[0]);
             try {
-                const batchRequests = uniqueQueries.map(({ address }, idx) => ({
-                    method: 'eth_getTransactionCount',
-                    params: [address, 'pending'],
-                    id: idx + 1,
-                    jsonrpc: '2.0',
-                }));
+                const batchRequests = uniqueQueries.flatMap(({ address }, idx) => [
+                    {
+                        method: 'eth_getTransactionCount',
+                        params: [address, 'latest'],
+                        id: idx * 2 + 1,
+                        jsonrpc: '2.0',
+                    },
+                    {
+                        method: 'eth_getTransactionCount',
+                        params: [address, 'pending'],
+                        id: idx * 2 + 2,
+                        jsonrpc: '2.0',
+                    },
+                ]);
                 const rawResults = await asBatchSendProvider(this.provider)._send(batchRequests);
-                queryResults = rawResults.map((r) => {
-                    if (r.result) {
-                        return parseInt(r.result, 16);
-                    }
-                    return 0;
-                });
+                const byId = new Map();
+                for (const row of rawResults) {
+                    const id = Number(row.id);
+                    byId.set(id, row.result ? parseInt(row.result, 16) : 0);
+                }
+                queryResults = uniqueQueries.map((_, idx) => Math.max(byId.get(idx * 2 + 1) || 0, byId.get(idx * 2 + 2) || 0));
             }
             catch {
-                const queryPromises = uniqueQueries.map(({ address }) => this.provider.getTransactionCount(address, 'pending'));
-                queryResults = await Promise.all(queryPromises);
+                queryResults = await Promise.all(uniqueQueries.map(({ address }) => this.readOnchainNonce(address)));
             }
             for (let i = 0; i < uniqueQueries.length; i++) {
                 const { address } = uniqueQueries[i];

package/dist/domains/lp-inspect/inspect-tax.d.ts

@@ -0,0 +1,6 @@
+import { type TokenStateV8 } from '../flap/portal.js';
+export declare function isFlapInnerMarket(status: unknown): boolean;
+/** 1–10 当百分数；≤10000 当 bps（Four feeRate 10000=100%）。 */
+export declare function normalizeFeeToBps(raw: number): number | undefined;
+export declare function flapV8TaxBps(st: TokenStateV8): number;
+export declare function readBscOuterTaxBps(token: string, rpcUrl: string): Promise<number | undefined>;

package/dist/domains/lp-inspect/inspect-tax.js

@@ -0,0 +1,82 @@
+/**
+ * LP inspect 税率：Flap 真实税 / Four TaxToken / 外盘常见 view。
+ * 非 Flap 币 Portal 槽位常残留 100 bps，不能当 Pancake 税币税率。
+ */
+import { Contract } from 'ethers';
+import { ZERO_ADDRESS } from '../../core/constants/index.js';
+import { TokenStatus } from '../flap/portal.js';
+import { getTaxTokenInfo, isTaxToken } from '../four/tax-token.js';
+import { getProvider } from './inspect-helpers.js';
+const GENERIC_TAX_FNS = [
+    'feeRate',
+    'buyTax',
+    'sellTax',
+    'buyFee',
+    'sellFee',
+    'taxFee',
+    'totalBuyFee',
+    'totalSellFee',
+];
+const GENERIC_TAX_ABI = GENERIC_TAX_FNS.map((name) => `function ${name}() view returns (uint256)`);
+export function isFlapInnerMarket(status) {
+    const n = Number(status);
+    return n === TokenStatus.Tradable || n === TokenStatus.InDuel;
+}
+function isZeroAddress(value) {
+    const s = String(value || '').toLowerCase();
+    return !s || s === ZERO_ADDRESS.toLowerCase();
+}
+/** 1–10 当百分数；≤10000 当 bps（Four feeRate 10000=100%）。 */
+export function normalizeFeeToBps(raw) {
+    if (!Number.isFinite(raw) || raw <= 0)
+        return undefined;
+    if (raw <= 10)
+        return Math.round(raw * 100);
+    if (raw <= 10000)
+        return Math.round(raw);
+    if (raw > 1e14 && raw <= 1e18) {
+        const bps = Math.round((raw / 1e18) * 10000);
+        return bps > 0 && bps <= 10000 ? bps : undefined;
+    }
+    return undefined;
+}
+export function flapV8TaxBps(st) {
+    const status = Number(st.status);
+    if (status === TokenStatus.Tradable || status === TokenStatus.InDuel) {
+        return Math.max(Number(st.buyTaxRate ?? 0n), Number(st.sellTaxRate ?? 0n));
+    }
+    if (status !== TokenStatus.DEX)
+        return 0;
+    if (isZeroAddress(st.pool) || isZeroAddress(st.quoteTokenAddress))
+        return 0;
+    return Math.max(Number(st.buyTaxRate ?? 0n), Number(st.sellTaxRate ?? 0n));
+}
+async function readGenericTokenTaxBps(token, provider) {
+    const tokenContract = new Contract(token, GENERIC_TAX_ABI, provider);
+    const reads = await Promise.allSettled(GENERIC_TAX_FNS.map(async (name) => {
+        const value = await tokenContract.getFunction(name).staticCall();
+        return normalizeFeeToBps(Number(value));
+    }));
+    let maxBps = 0;
+    for (const item of reads) {
+        if (item.status !== 'fulfilled' || typeof item.value !== 'number')
+            continue;
+        if (item.value > maxBps)
+            maxBps = item.value;
+    }
+    return maxBps > 0 ? maxBps : undefined;
+}
+export async function readBscOuterTaxBps(token, rpcUrl) {
+    try {
+        if (await isTaxToken(token, rpcUrl)) {
+            const fee = Number((await getTaxTokenInfo(token, rpcUrl)).config.feeRate);
+            const bps = normalizeFeeToBps(fee);
+            if (bps)
+                return bps;
+        }
+    }
+    catch {
+        /* 非 Four TaxToken */
+    }
+    return readGenericTokenTaxBps(token, getProvider(rpcUrl));
+}

package/dist/domains/lp-inspect/inspect-tax.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/domains/lp-inspect/inspect-tax.test.js

@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest';
+import { ZERO_ADDRESS } from '../../core/constants/index.js';
+import { TokenStatus } from '../flap/portal.js';
+import { flapV8TaxBps, isFlapInnerMarket, normalizeFeeToBps } from './inspect-tax.js';
+function v8(partial) {
+    return {
+        reserve: 0n,
+        circulatingSupply: 0n,
+        price: 0n,
+        tokenVersion: 6,
+        r: 0n,
+        h: 0n,
+        k: 0n,
+        dexSupplyThresh: 0n,
+        quoteTokenAddress: ZERO_ADDRESS,
+        nativeToQuoteSwapEnabled: false,
+        extensionID: '0x0000000000000000000000000000000000000000000000000000000000000000',
+        buyTaxRate: 0n,
+        sellTaxRate: 0n,
+        taxRate: 0n,
+        pool: ZERO_ADDRESS,
+        progress: 0n,
+        lpFeeProfile: 0,
+        dexId: 0,
+        ...partial,
+    };
+}
+describe('normalizeFeeToBps', () => {
+    it('treats 1–10 as percent', () => {
+        expect(normalizeFeeToBps(5)).toBe(500);
+        expect(normalizeFeeToBps(1)).toBe(100);
+    });
+    it('keeps Four feeRate / bps as-is up to 10000', () => {
+        expect(normalizeFeeToBps(500)).toBe(500);
+        expect(normalizeFeeToBps(0)).toBeUndefined();
+    });
+});
+describe('flapV8TaxBps', () => {
+    it('reads inner flap tax', () => {
+        expect(isFlapInnerMarket(TokenStatus.Tradable)).toBe(true);
+        expect(flapV8TaxBps(v8({
+            status: TokenStatus.Tradable,
+            buyTaxRate: 100n,
+            sellTaxRate: 500n,
+        }))).toBe(500);
+    });
+    it('ignores DEX leftover 100 bps when pool/quote are zero', () => {
+        expect(flapV8TaxBps(v8({
+            status: TokenStatus.DEX,
+            buyTaxRate: 100n,
+            sellTaxRate: 100n,
+        }))).toBe(0);
+    });
+    it('keeps graduated flap tax when pool and quote exist', () => {
+        expect(flapV8TaxBps(v8({
+            status: TokenStatus.DEX,
+            pool: '0x1111111111111111111111111111111111111111',
+            quoteTokenAddress: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
+            buyTaxRate: 100n,
+            sellTaxRate: 500n,
+        }))).toBe(500);
+    });
+});

package/dist/domains/lp-inspect/inspect.js

@@ -7,30 +7,12 @@
 import { Contract, formatEther } from 'ethers';
 import { ADDRESSES, ZERO_ADDRESS } from '../../core/constants/index.js';
 import { Helper3 } from '../four/contracts/helper3.js';
-import { FlapPortal, TokenStatus, } from '../flap/portal.js';
-import { getTaxTokenInfo, isTaxToken } from '../four/tax-token.js';
+import { FlapPortal } from '../flap/portal.js';
 import { DEFAULT_V3_FEE_TIERS } from './lp-inspect-helpers.js';
 import { getChainConfig } from './registry.js';
 import { determinePlatform, formatBalance, getProvider, getTokenDecimals, normalizeLiquidity, queryV2Pairs, queryV3Pools, } from './inspect-helpers.js';
-// ============================================================================
-// 常量（从公共模块导入）
-// ============================================================================
+import { flapV8TaxBps, isFlapInnerMarket, readBscOuterTaxBps } from './inspect-tax.js';
 const MULTICALL3_ADDRESS = ADDRESSES.BSC.Multicall3;
-/** 内盘可交易：1=Tradable，2=InDuel。0=无效（非 Flap 币常见）、3=已杀死、4=已毕业外盘，都不能当内盘提前返回。 */
-function isFlapInnerMarket(status) {
-    const n = Number(status);
-    return n === TokenStatus.Tradable || n === TokenStatus.InDuel;
-}
-/** BSC V8 买卖税。只有真实 Flap 状态才读买卖税，避免非 Flap 币 slot 残留 100 bps。 */
-function flapV8TaxBps(st) {
-    const status = Number(st.status);
-    if (status !== TokenStatus.Tradable &&
-        status !== TokenStatus.InDuel &&
-        status !== TokenStatus.DEX) {
-        return 0;
-    }
-    return Math.max(Number(st.buyTaxRate ?? 0n), Number(st.sellTaxRate ?? 0n));
-}
 // ============================================================================
 // 主查询函数
 // ============================================================================
@@ -207,17 +189,9 @@ export async function inspectTokenLP(token, opts) {
                 const offerTokens = formatBalance(info.offers, shouldFormat);
                 const lastPrice = formatBalance(info.lastPrice, shouldFormat);
                 result.four = { helper: ADDRESSES.BSC.TokenManagerHelper3, reserveNative, offerTokens, lastPrice };
-                try {
-                    if (await isTaxToken(token, opts.rpcUrl)) {
-                        const fee = Number((await getTaxTokenInfo(token, opts.rpcUrl)).config.feeRate);
-                        const taxRate = fee > 0 && fee <= 10 ? fee * 100 : fee;
-                        if (taxRate > 0)
-                            result.taxRate = taxRate;
-                    }
-                }
-                catch {
-                    // 非 TaxToken 或读费率失败
-                }
+                const innerTax = await readBscOuterTaxBps(token, opts.rpcUrl);
+                if (innerTax)
+                    result.taxRate = innerTax;
                 return result;
             }
         }
@@ -351,10 +325,14 @@ export async function inspectTokenLP(token, opts) {
     // 确定平台类型
     result.platform = determinePlatform(result.allPools);
     // ========================================
-    // 4. 外盘税率查询（仅 Flap 链）
+    // 4. 外盘税率：合约 view 优先，Flap Portal 只认真实毕业盘
     // ========================================
-    // 对于已毕业到外盘的代币，尝试从 Flap Portal 获取税率
-    if (opts.flapChain && !result.flap && result.platform !== 'UNKNOWN') {
+    if (opts.chain === 'BSC' && !result.taxRate) {
+        const outerTax = await readBscOuterTaxBps(token, opts.rpcUrl);
+        if (outerTax)
+            result.taxRate = outerTax;
+    }
+    if (opts.flapChain && !result.flap && !result.taxRate && result.platform !== 'UNKNOWN') {
         try {
             const flap = new FlapPortal({ chain: opts.flapChain, rpcUrl: opts.rpcUrl });
             let taxRate = 0;

package/package.json

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