four-flap-meme-sdk 2.2.8 → 2.2.11

package/dist/shared/flap/portal-create-token.js

@@ -1,24 +1,19 @@
 /**
  * Portal 发币交易构建（newTokenV6 / newTokenV7 / VaultPortal）
- *
- * 对齐 Flap 官方文档：
- * - newTokenV6：TOKEN_V2_PERMIT / TOKEN_TAXED_V3
- * - newTokenV7：TOKEN_V3_PERMIT（BSC 标准 V3 / PCS Infinity CL，与 Flap 官网一致）
- * - newTokenV4：已弃用（Portal 侧 FeatureDisabled，勿再使用）
- * - VaultPortal.newTaxTokenWithVault：带金库的税币（legacy 参数结构）
+ * @see https://docs.flap.sh/flap/developers/token-launcher-developers/launch-token-through-portal
  */
 import { Contract, ZeroAddress } from 'ethers';
 import { ZERO_ADDRESS } from '../constants/index.js';
-import { buildVaultParams, VAULT_PORTAL_ADDRESSES, VAULT_PORTAL_ABI } from './vault.js';
+import { buildNewTokenV6WithVaultParams, VAULT_PORTAL_ADDRESSES, VAULT_PORTAL_ABI, } from './vault.js';
+import { buildNewTokenV6Params, normalizeTaxV2Fields } from './launch-v6.js';
 import { TokenVersion, MigratorType, FeeType } from './portal.js';
-/** 分红代币：将 launching token 本身作为分红代币 */
 export const MAGIC_DIVIDEND_SELF = '0xfEEDFEEDfeEDFEedFEEdFEEDFeEdfEEdFeEdFEEd';
 function zeroBytes32() {
     return '0x' + '00'.repeat(32);
 }
-function resolveTaxRates(taxConfig, taxRate) {
-    const buy = taxConfig?.buyTaxRate ?? taxRate ?? 0;
-    const sell = taxConfig?.sellTaxRate ?? taxRate ?? 0;
+function resolveTaxRates(taxConfig, taxRate, buyTaxRate, sellTaxRate) {
+    const buy = taxConfig?.buyTaxRate ?? buyTaxRate ?? taxRate ?? 0;
+    const sell = taxConfig?.sellTaxRate ?? sellTaxRate ?? taxRate ?? 0;
     return { buyTaxRate: buy & 0xffff, sellTaxRate: sell & 0xffff };
 }
 function validateTaxDistribution(mkt, def, div, lp) {
@@ -27,77 +22,47 @@ function validateTaxDistribution(mkt, def, div, lp) {
         throw new Error(`Tax distribution must sum to 10000 (100%), got ${total}`);
     }
 }
-function buildV6TaxParams(params, taxConfig, dist) {
-    const { buyTaxRate, sellTaxRate } = resolveTaxRates(taxConfig, params.taxRate);
-    validateTaxDistribution(dist.mktBps, dist.deflationBps, dist.dividendBps, dist.lpBps);
-    return {
-        name: params.tokenInfo.name,
-        symbol: params.tokenInfo.symbol,
-        meta: params.tokenInfo.meta,
-        dexThresh: (params.dexThresh ?? 1) & 0xff,
-        salt: params.salt ?? zeroBytes32(),
-        migratorType: (params.migratorType ?? MigratorType.V2_MIGRATOR) & 0xff,
-        quoteToken: params.quoteToken || ZERO_ADDRESS,
-        quoteAmt: resolveCreateQuoteAmt(params),
-        beneficiary: params.beneficiary,
-        permitData: '0x',
-        extensionID: params.extensionID ?? zeroBytes32(),
-        extensionData: params.extensionData ?? '0x',
-        dexId: (params.dexId ?? 0) & 0xff,
-        lpFeeProfile: (params.lpFeeProfile ?? 0) & 0xff,
-        buyTaxRate,
-        sellTaxRate,
-        taxDuration: BigInt(taxConfig.taxDuration),
-        antiFarmerDuration: BigInt(taxConfig.antiFarmerDuration),
-        mktBps: dist.mktBps,
-        deflationBps: dist.deflationBps,
-        dividendBps: dist.dividendBps,
-        lpBps: dist.lpBps,
-        minimumShareBalance: BigInt(taxConfig.minimumShareBalance ?? 10000) * 10n ** 18n,
-        dividendToken: taxConfig.dividendToken || ZeroAddress,
-        commissionReceiver: taxConfig.commissionReceiver || ZeroAddress,
-        tokenVersion: TokenVersion.TOKEN_TAXED_V3,
-    };
+function resolveCreateQuoteAmt(params) {
+    return params.initialQuoteAmt ?? 0n;
+}
+function resolveUseV7Portal(params) {
+    return !!params.useV7Portal;
 }
-/** 将 TaxV2Config（含 distribution 嵌套）或 flat 结构归一化 */
+/** bundle 发币路径：标准 V3（dexId/lpFeeProfile）→ newTokenV7，税币/金库 → V6 */
+export function resolveCreateTokenLaunchFlags(params) {
+    const normalizedTax = normalizeTaxLaunchConfig(params.taxV2Config, params.taxRate);
+    const hasVault = !!normalizedTax?.vaultConfig && normalizedTax.vaultConfig.vaultType !== 'none';
+    const isTaxLaunch = !!normalizedTax || hasVault || (params.taxRate ?? 0) > 0;
+    const useV7Portal = !isTaxLaunch &&
+        !hasVault &&
+        (params.lpFeeProfile !== undefined ||
+            params.dexId !== undefined ||
+            params.migratorType === MigratorType.PCS_INFINITY_CL_MIGRATOR);
+    return { normalizedTax, useV7Portal };
+}
+/** 将 TaxV2Config（含 distribution）归一化；金库发射在税率为 0 时仍返回配置 */
 export function normalizeTaxLaunchConfig(input, fallbackTaxRate) {
     if (!input)
         return undefined;
-    const dist = 'distribution' in input ? input.distribution : undefined;
-    const mktBps = dist?.mktBps ?? input.mktBps ?? 10000;
-    const deflationBps = dist?.deflationBps ?? input.deflationBps ?? 0;
-    const dividendBps = dist?.dividendBps ?? input.dividendBps ?? 0;
-    const lpBps = dist?.lpBps ?? input.lpBps ?? 0;
-    const minimumShareBalance = dist?.minimumShareBalance ?? input.minimumShareBalance;
-    const buyTaxRate = input.buyTaxRate ?? fallbackTaxRate ?? 0;
-    const sellTaxRate = input.sellTaxRate ?? fallbackTaxRate ?? 0;
-    if (buyTaxRate <= 0 && sellTaxRate <= 0)
+    const flat = normalizeTaxV2Fields(input);
+    const buyTaxRate = fallbackTaxRate ?? 0;
+    const sellTaxRate = fallbackTaxRate ?? 0;
+    const hasVault = flat.vaultConfig && flat.vaultConfig.vaultType !== 'none';
+    if (buyTaxRate <= 0 && sellTaxRate <= 0 && !hasVault)
         return undefined;
     return {
-        taxDuration: input.taxDuration,
-        antiFarmerDuration: input.antiFarmerDuration,
-        mktBps,
-        deflationBps,
-        dividendBps,
-        lpBps,
-        minimumShareBalance,
-        buyTaxRate,
-        sellTaxRate,
-        dividendToken: input.dividendToken,
-        commissionReceiver: input.commissionReceiver,
-        vaultConfig: input.vaultConfig,
+        taxDuration: flat.taxDuration,
+        antiFarmerDuration: flat.antiFarmerDuration,
+        mktBps: flat.mktBps,
+        deflationBps: flat.deflationBps,
+        dividendBps: flat.dividendBps,
+        lpBps: flat.lpBps,
+        minimumShareBalance: flat.minimumShareBalance,
+        buyTaxRate: buyTaxRate > 0 ? buyTaxRate : (hasVault ? 1 : 0),
+        sellTaxRate: sellTaxRate > 0 ? sellTaxRate : (hasVault ? 1 : 0),
+        vaultConfig: flat.vaultConfig,
     };
 }
-/**
- * 构建发币 populateTransaction（优先 V6/V7，Vault 走 VaultPortal）
- */
-function resolveCreateQuoteAmt(params) {
-    return params.initialQuoteAmt ?? 0n;
-}
-function resolveUseV7Portal(params) {
-    return !!(params.useV7Portal ?? params.useV4Portal ?? params.useClInfinityLaunch);
-}
-/** Flap 文档：TOKEN_V3_PERMIT 须 migratorType=3、feeConfigs 单槽 MARKETING_OR_VAULT 10000 bps */
 function buildNewTokenV7PermitParams(params) {
     const emptyFeeConfig = {
         feeType: FeeType.NONE,
@@ -137,10 +102,9 @@ function buildNewTokenV7PermitParams(params) {
 }
 export async function populateCreateTokenTransaction(params) {
     const taxConfig = params.taxConfig;
-    const { buyTaxRate, sellTaxRate } = resolveTaxRates(taxConfig, params.taxRate);
+    const { buyTaxRate, sellTaxRate } = resolveTaxRates(taxConfig, params.taxRate, params.buyTaxRate, params.sellTaxRate);
     const isTaxLaunch = buyTaxRate > 0 || sellTaxRate > 0;
-    const quoteAmt = resolveCreateQuoteAmt(params);
-    // 1) Vault 金库税币
+    // 1) 金库税币 → VaultPortal.newTokenV6WithVault
     if (taxConfig?.vaultConfig && taxConfig.vaultConfig.vaultType !== 'none') {
         validateTaxDistribution(taxConfig.mktBps, taxConfig.deflationBps, taxConfig.dividendBps, taxConfig.lpBps);
         const chainKey = params.chain.toUpperCase();
@@ -149,59 +113,98 @@ export async function populateCreateTokenTransaction(params) {
             throw new Error(`链 "${params.chain}" 不支持 Tax Vault 金库功能`);
         }
         const vaultPortal = new Contract(vaultPortalAddr, VAULT_PORTAL_ABI, params.devWallet);
-        const { vaultFactory, vaultData } = buildVaultParams(taxConfig.vaultConfig, chainKey);
-        return vaultPortal.newTaxTokenWithVault.populateTransaction({
-            name: params.tokenInfo.name,
-            symbol: params.tokenInfo.symbol,
-            meta: params.tokenInfo.meta,
-            dexThresh: (params.dexThresh ?? 1) & 0xff,
-            salt: params.salt ?? zeroBytes32(),
-            taxRate: Math.max(buyTaxRate, sellTaxRate) & 0xffff,
-            migratorType: (params.migratorType ?? MigratorType.V2_MIGRATOR) & 0xff,
-            quoteToken: params.quoteToken || ZERO_ADDRESS,
-            quoteAmt,
-            permitData: '0x',
-            extensionID: zeroBytes32(),
-            extensionData: '0x',
-            dexId: (params.dexId ?? 0) & 0xff,
-            lpFeeProfile: (params.lpFeeProfile ?? 0) & 0xff,
-            taxDuration: BigInt(taxConfig.taxDuration),
-            antiFarmerDuration: BigInt(taxConfig.antiFarmerDuration),
-            mktBps: taxConfig.mktBps,
-            deflationBps: taxConfig.deflationBps,
-            dividendBps: taxConfig.dividendBps,
-            lpBps: taxConfig.lpBps,
-            minimumShareBalance: BigInt(taxConfig.minimumShareBalance ?? 10000) * 10n ** 18n,
-            vaultFactory,
-            vaultData,
+        const tv2 = {
+            taxDuration: taxConfig.taxDuration,
+            antiFarmerDuration: taxConfig.antiFarmerDuration,
+            distribution: {
+                mktBps: taxConfig.mktBps,
+                deflationBps: taxConfig.deflationBps,
+                dividendBps: taxConfig.dividendBps,
+                lpBps: taxConfig.lpBps,
+                minimumShareBalance: taxConfig.minimumShareBalance,
+            },
+            vaultConfig: taxConfig.vaultConfig,
+        };
+        const v6VaultParams = buildNewTokenV6WithVaultParams({
+            tokenInfo: params.tokenInfo,
+            taxV2: tv2,
+            chain: chainKey,
+            salt: params.salt,
+            taxRate: Math.max(buyTaxRate, sellTaxRate),
+            buyTaxRate,
+            sellTaxRate,
+            dexThresh: params.dexThresh,
+            migratorType: params.migratorType,
+            quoteToken: params.quoteToken,
+            quoteAmt: resolveCreateQuoteAmt(params),
+            dexId: params.dexId,
+            lpFeeProfile: params.lpFeeProfile,
         });
+        return vaultPortal.newTokenV6WithVault.populateTransaction(v6VaultParams);
     }
-    // 2) 税币 V3（newTokenV6 + TOKEN_TAXED_V3）
+    // 2) 税币无金库 → newTokenV6 + TOKEN_TAXED_V3
     if (isTaxLaunch && taxConfig) {
-        return params.originalPortal.newTokenV6.populateTransaction(buildV6TaxParams(params, taxConfig, {
-            mktBps: taxConfig.mktBps,
-            deflationBps: taxConfig.deflationBps,
-            dividendBps: taxConfig.dividendBps,
-            lpBps: taxConfig.lpBps,
+        const tv2 = {
+            taxDuration: taxConfig.taxDuration,
+            antiFarmerDuration: taxConfig.antiFarmerDuration,
+            distribution: {
+                mktBps: taxConfig.mktBps,
+                deflationBps: taxConfig.deflationBps,
+                dividendBps: taxConfig.dividendBps,
+                lpBps: taxConfig.lpBps,
+                minimumShareBalance: taxConfig.minimumShareBalance,
+            },
+            vaultConfig: taxConfig.vaultConfig,
+        };
+        return params.originalPortal.newTokenV6.populateTransaction(buildNewTokenV6Params({
+            tokenInfo: params.tokenInfo,
+            taxV2: tv2,
+            beneficiary: params.beneficiary,
+            salt: params.salt,
+            taxRate: Math.max(buyTaxRate, sellTaxRate),
+            buyTaxRate,
+            sellTaxRate,
+            dexThresh: params.dexThresh,
+            migratorType: params.migratorType,
+            quoteToken: params.quoteToken,
+            quoteAmt: resolveCreateQuoteAmt(params),
+            dexId: params.dexId,
+            lpFeeProfile: params.lpFeeProfile,
+            extensionID: params.extensionID,
+            extensionData: params.extensionData,
         }));
     }
     if (isTaxLaunch) {
-        return params.originalPortal.newTokenV6.populateTransaction(buildV6TaxParams(params, {
-            taxDuration: 365 * 24 * 60 * 60,
-            antiFarmerDuration: 3 * 24 * 60 * 60,
-            mktBps: 10000,
-            deflationBps: 0,
-            dividendBps: 0,
-            lpBps: 0,
+        return params.originalPortal.newTokenV6.populateTransaction(buildNewTokenV6Params({
+            tokenInfo: params.tokenInfo,
+            taxV2: {
+                taxDuration: 365 * 24 * 60 * 60,
+                antiFarmerDuration: 3 * 24 * 60 * 60,
+                distribution: {
+                    mktBps: 10000,
+                    deflationBps: 0,
+                    dividendBps: 0,
+                    lpBps: 0,
+                },
+            },
+            beneficiary: params.beneficiary,
+            salt: params.salt,
+            taxRate: Math.max(buyTaxRate, sellTaxRate),
             buyTaxRate,
             sellTaxRate,
-        }, { mktBps: 10000, deflationBps: 0, dividendBps: 0, lpBps: 0 }));
+            dexThresh: params.dexThresh,
+            migratorType: params.migratorType,
+            quoteToken: params.quoteToken,
+            quoteAmt: resolveCreateQuoteAmt(params),
+            dexId: params.dexId,
+            lpFeeProfile: params.lpFeeProfile,
+        }));
     }
-    // 3) 标准 V3 / TOKEN_V3_PERMIT（newTokenV7 — 与 Flap 官网 / Portal v5.8.6+ 一致；V4 已 FeatureDisabled）
+    // 3) 标准 V3 池 → newTokenV7（Portal v5.8.6+；V4 已 FeatureDisabled）
     if (resolveUseV7Portal(params)) {
         return params.originalPortal.newTokenV7.populateTransaction(buildNewTokenV7PermitParams(params));
     }
-    // 4) 仅 extension（newTokenV3）
+    // 4) extension only → newTokenV3
     const hasExtension = !!params.extensionID &&
         params.extensionID !== zeroBytes32() &&
         params.lpFeeProfile === undefined &&
@@ -216,14 +219,14 @@ export async function populateCreateTokenTransaction(params) {
             taxRate: (params.taxRate ?? 0) & 0xffff,
             migratorType: (params.migratorType ?? MigratorType.V3_MIGRATOR) & 0xff,
             quoteToken: params.quoteToken || ZERO_ADDRESS,
-            quoteAmt,
+            quoteAmt: resolveCreateQuoteAmt(params),
             beneficiary: params.beneficiary,
             permitData: '0x',
             extensionID: params.extensionID,
             extensionData: params.extensionData ?? '0x',
         });
     }
-    // 5) 标准 V2（newTokenV6 + TOKEN_V2_PERMIT）
+    // 5) 标准 V2 路径 → newTokenV6 + TOKEN_V2_PERMIT
     return params.originalPortal.newTokenV6.populateTransaction({
         name: params.tokenInfo.name,
         symbol: params.tokenInfo.symbol,
@@ -232,7 +235,7 @@ export async function populateCreateTokenTransaction(params) {
         salt: params.salt ?? zeroBytes32(),
         migratorType: (params.migratorType ?? MigratorType.V2_MIGRATOR) & 0xff,
         quoteToken: params.quoteToken || ZERO_ADDRESS,
-        quoteAmt,
+        quoteAmt: resolveCreateQuoteAmt(params),
         beneficiary: params.beneficiary,
         permitData: '0x',
         extensionID: params.extensionID ?? zeroBytes32(),

package/dist/shared/flap/portal.d.ts

@@ -12,8 +12,9 @@ export declare enum TokenVersion {
     TOKEN_V2_PERMIT = 2,
     TOKEN_GOPLUS = 3,
     TOKEN_TAXED = 4,
-    TOKEN_TAXED_V2 = 5,
+    /** FlapTaxTokenV3 — 推荐税币；配合 newTokenV6 / newTokenV6WithVault */
     TOKEN_TAXED_V3 = 6,
+    /** 标准 V3 池（PCS Infinity CL）；配合 newTokenV7 */
     TOKEN_V3_PERMIT = 7
 }
 /** newTokenV7 feeConfigs 槽位类型 */

package/dist/shared/flap/portal.js

@@ -16,8 +16,9 @@ export var TokenVersion;
     TokenVersion[TokenVersion["TOKEN_V2_PERMIT"] = 2] = "TOKEN_V2_PERMIT";
     TokenVersion[TokenVersion["TOKEN_GOPLUS"] = 3] = "TOKEN_GOPLUS";
     TokenVersion[TokenVersion["TOKEN_TAXED"] = 4] = "TOKEN_TAXED";
-    TokenVersion[TokenVersion["TOKEN_TAXED_V2"] = 5] = "TOKEN_TAXED_V2";
+    /** FlapTaxTokenV3 — 推荐税币；配合 newTokenV6 / newTokenV6WithVault */
     TokenVersion[TokenVersion["TOKEN_TAXED_V3"] = 6] = "TOKEN_TAXED_V3";
+    /** 标准 V3 池（PCS Infinity CL）；配合 newTokenV7 */
     TokenVersion[TokenVersion["TOKEN_V3_PERMIT"] = 7] = "TOKEN_V3_PERMIT";
 })(TokenVersion || (TokenVersion = {}));
 /** newTokenV7 feeConfigs 槽位类型 */
@@ -95,11 +96,11 @@ const PORTAL_ABI = [
     'function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData)) external payable returns (address)',
     'function newTokenV3((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData)) external payable returns (address)',
     'function newTokenV4((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile)) external payable returns (address)',
-    // newTokenV5: 支持 Tax Token V2 高级税收分配（legacy，推荐 newTokenV6）
+    // newTokenV5: 支持 Tax Token V2 高级税收分配（taxRate > 0 时使用，Legacy）
     'function newTokenV5((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile,uint64 taxDuration,uint64 antiFarmerDuration,uint16 mktBps,uint16 deflationBps,uint16 dividendBps,uint16 lpBps,uint256 minimumShareBalance)) external payable returns (address)',
-    // newTokenV6: 统一入口（TOKEN_V2_PERMIT / TOKEN_TAXED_V3）
+    // newTokenV6: 统一发射入口（标准 TOKEN_V2_PERMIT / 税币 TOKEN_TAXED_V3）
     'function newTokenV6((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint8 lpFeeProfile,uint16 buyTaxRate,uint16 sellTaxRate,uint64 taxDuration,uint64 antiFarmerDuration,uint16 mktBps,uint16 deflationBps,uint16 dividendBps,uint16 lpBps,uint256 minimumShareBalance,address dividendToken,address commissionReceiver,uint8 tokenVersion)) external payable returns (address)',
-    // newTokenV7: TOKEN_V3_PERMIT + CL 迁移
+    // newTokenV7: TOKEN_V3_PERMIT + PCS Infinity CL 迁移（标准 V3 池，Portal v5.8.6+）
     'function newTokenV7((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint8 migratorType,address quoteToken,uint256 quoteAmt,bytes permitData,bytes32 extensionID,bytes extensionData,uint8 dexId,uint16 buyTaxRate,uint16 sellTaxRate,uint64 taxDuration,uint64 antiFarmerDuration,address commissionReceiver,uint8 tokenVersion,(uint8 feeType,uint16 bps,address marketingAddress,address dividendToken,uint256 minimumShareBalance)[4] feeConfigs)) external payable returns (address)',
     // 受益人领取
     'function claim(address token) external returns (uint256,uint256)',
@@ -108,21 +109,17 @@ const PORTAL_ABI = [
     'function getFeeRate() external view returns (uint256,uint256)',
     'function nonce() external view returns (uint256)',
     'function version() external pure returns (string)',
-    'function getLocks(address token) external view returns (uint256[])',
+    'function getLocks(address token) external view returns (uint256[])'
 ];
 /**
  * 将 lpFeeProfile 转换为 V3 fee 值
  */
 export function lpFeeProfileToV3Fee(profile) {
     switch (profile) {
-        case V3LPFeeProfile.LP_FEE_PROFILE_STANDARD:
-            return 2500;
-        case V3LPFeeProfile.LP_FEE_PROFILE_LOW:
-            return 100;
-        case V3LPFeeProfile.LP_FEE_PROFILE_HIGH:
-            return 10000;
-        default:
-            return 2500; // 默认 STANDARD
+        case V3LPFeeProfile.LP_FEE_PROFILE_STANDARD: return 2500;
+        case V3LPFeeProfile.LP_FEE_PROFILE_LOW: return 100;
+        case V3LPFeeProfile.LP_FEE_PROFILE_HIGH: return 10000;
+        default: return 2500; // 默认 STANDARD
     }
 }
 /**
@@ -139,11 +136,6 @@ export function validateTaxDistribution(config) {
     return { valid: true };
 }
 export class FlapPortal {
-    rpcUrl;
-    portal;
-    contract;
-    buyFeeRate;
-    sellFeeRate;
     constructor(cfg) {
         this.rpcUrl = cfg.rpcUrl;
         this.portal = cfg.addressOverride ?? FLAP_PORTAL_ADDRESSES[cfg.chain];
@@ -158,27 +150,13 @@ export class FlapPortal {
     async getTokenV2(token) {
         const r = await this.contract.getTokenV2(token);
         return {
-            status: r[0],
-            reserve: r[1],
-            circulatingSupply: r[2],
-            price: r[3],
-            tokenVersion: r[4],
-            r: r[5],
-            dexSupplyThresh: r[6],
+            status: r[0], reserve: r[1], circulatingSupply: r[2], price: r[3], tokenVersion: r[4], r: r[5], dexSupplyThresh: r[6],
         };
     }
     async getTokenV3(token) {
         const r = await this.contract.getTokenV3(token);
         return {
-            status: r[0],
-            reserve: r[1],
-            circulatingSupply: r[2],
-            price: r[3],
-            tokenVersion: r[4],
-            r: r[5],
-            dexSupplyThresh: r[6],
-            quoteTokenAddress: r[7],
-            nativeToQuoteSwapEnabled: r[8],
+            status: r[0], reserve: r[1], circulatingSupply: r[2], price: r[3], tokenVersion: r[4], r: r[5], dexSupplyThresh: r[6], quoteTokenAddress: r[7], nativeToQuoteSwapEnabled: r[8],
         };
     }
     async getTokenV4(token) {
@@ -250,6 +228,7 @@ export class FlapPortal {
         const curve = new CDPV2(r, h, k);
         const currentReserve = formatEther(state.reserve);
         const dexSupplyThresh = formatEther(state.dexSupplyThresh);
+        const circulatingSupply = formatEther(state.circulatingSupply);
         // 计算毕业时的储备
         const graduationReserve = curve.estimateReserve(dexSupplyThresh);
         const graduationReserveNum = parseFloat(graduationReserve.toString());
@@ -261,7 +240,9 @@ export class FlapPortal {
         // 含手续费（1% buy fee）
         const remainingWithFee = remainingNet / (1 - this.buyFeeRate);
         // 计算进度
-        const progressPercent = isGraduated ? '100.00' : ((currentReserveNum / graduationReserveNum) * 100).toFixed(2);
+        const progressPercent = isGraduated
+            ? '100.00'
+            : (currentReserveNum / graduationReserveNum * 100).toFixed(2);
         return {
             remainingOkb: remainingWithFee.toFixed(6),
             graduationReserve: graduationReserveNum.toFixed(6),
@@ -369,7 +350,6 @@ export class FlapPortal {
     }
 }
 export class FlapPortalWriter extends FlapPortal {
-    wallet;
     constructor(cfg, privateKey) {
         super(cfg);
         // 使用 ethers v6 创建钱包
@@ -618,3 +598,15 @@ export class FlapPortalWriter extends FlapPortal {
         return this.portal;
     }
 }
+/**
+ * 获取 Flap Portal 合约地址（内部使用）
+ * 注意：此方法不对外导出，用户应使用 FlapPortal 实例而非直接获取地址
+ * @internal
+ */
+function getFlapPortalAddress(chain) {
+    const address = FLAP_PORTAL_ADDRESSES[chain];
+    if (!address) {
+        throw new Error(`Flap Portal not deployed on ${chain}`);
+    }
+    return address;
+}

package/dist/shared/flap/vanity.d.ts

@@ -8,12 +8,11 @@ export declare function predictVanityTokenAddress(salt: string, portal: string,
  * SDK 自动使用该链的 Portal 和 TokenImpl 地址
  * 注意：使用 Flap 平台的原始 Portal 地址进行 CREATE2 计算
  * BSC/MONAD 默认使用 NORMAL 实现（非税版）
- * @param taxedV5 - 是否使用 V5 高级税代币实现 (mkt/deflation/dividend/lp)
+ * @param taxedV5 - Legacy V5 税币 impl（不推荐，请用 taxedV3）
+ * @param taxedV3 - TOKEN_TAXED_V3（newTokenV6 / newTokenV6WithVault）
+ * @param useV3Permit - TOKEN_V3_PERMIT / newTokenV7（标准 V3 池）
  */
-export declare function predictVanityTokenAddressByChain(chain: 'BSC' | 'BASE' | 'XLAYER' | 'MORPH' | 'MONAD', salt: string, taxed?: boolean, taxedV5?: boolean, // ✅ V5 高级税代币标识 (mkt/deflation/dividend/lp)
-taxedV3?: boolean, // ✅ V5 + Vault 金库税代币标识
-/** BSC 标准币 + newTokenV7 / TOKEN_V3_PERMIT */
-useV3Permit?: boolean): string;
+export declare function predictVanityTokenAddressByChain(chain: 'BSC' | 'BASE' | 'XLAYER' | 'MORPH' | 'MONAD', salt: string, taxed?: boolean, taxedV5?: boolean, taxedV3?: boolean, useV3Permit?: boolean): string;
 /**
  * 寻找满足后缀的 salt（默认 8888）
  * 注意：该方法为同步 CPU 搜索，谨慎设置迭代限制
@@ -35,7 +34,8 @@ export declare function findSaltEnding(opts: {
  * 注意：使用 Flap 平台的原始 Portal 地址进行 CREATE2 计算
  * BSC/MONAD 默认使用 NORMAL 实现（非税版）
  * XLayer 只有标准版，后缀是 1111
- * @param taxedV5 - 是否使用 V5 高级税代币实现 (mkt/deflation/dividend/lp)
+ * @param taxedV5 - Legacy V5 impl
+ * @param taxedV3 - TOKEN_TAXED_V3 impl（推荐）
  */
 export declare function findSaltEndingByChain(opts: {
     chain: 'BSC' | 'BASE' | 'XLAYER' | 'MORPH' | 'MONAD';

package/dist/shared/flap/vanity.js

@@ -6,7 +6,9 @@ import { FLAP_ORIGINAL_PORTAL_ADDRESSES, FLAP_TOKEN_IMPL_ADDRESSES, getVanitySuf
  */
 export function predictVanityTokenAddress(salt, portal, tokenImpl) {
     // 规范化 salt 到 bytes32（避免前端传入的短字符串导致不可预期行为）
-    const normalizedSalt = /^0x[0-9a-fA-F]{64}$/.test(salt) ? salt.toLowerCase() : keccak256(salt);
+    const normalizedSalt = /^0x[0-9a-fA-F]{64}$/.test(salt)
+        ? salt.toLowerCase()
+        : keccak256(salt);
     // 构建 EIP-1167 minimal proxy bytecode
     const bytecode = '0x3d602d80600a3d3981f3363d3d373d3d3d363d73' + tokenImpl.slice(2).toLowerCase() + '5af43d82803e903d91602b57fd5bf3';
     const bytecodeHash = keccak256(bytecode);
@@ -17,18 +19,19 @@ export function predictVanityTokenAddress(salt, portal, tokenImpl) {
  * SDK 自动使用该链的 Portal 和 TokenImpl 地址
  * 注意：使用 Flap 平台的原始 Portal 地址进行 CREATE2 计算
  * BSC/MONAD 默认使用 NORMAL 实现（非税版）
- * @param taxedV5 - 是否使用 V5 高级税代币实现 (mkt/deflation/dividend/lp)
+ * @param taxedV5 - Legacy V5 税币 impl（不推荐，请用 taxedV3）
+ * @param taxedV3 - TOKEN_TAXED_V3（newTokenV6 / newTokenV6WithVault）
+ * @param useV3Permit - TOKEN_V3_PERMIT / newTokenV7（标准 V3 池）
  */
-export function predictVanityTokenAddressByChain(chain, salt, taxed = false, taxedV5 = false, // ✅ V5 高级税代币标识 (mkt/deflation/dividend/lp)
-taxedV3 = false, // ✅ V5 + Vault 金库税代币标识
-/** BSC 标准币 + newTokenV7 / TOKEN_V3_PERMIT */
-useV3Permit = false) {
+export function predictVanityTokenAddressByChain(chain, salt, taxed = false, taxedV5 = false, taxedV3 = false, useV3Permit = false) {
     // 使用 Flap 平台的原始 Portal 地址（用于 CREATE2）
     const portal = FLAP_ORIGINAL_PORTAL_ADDRESSES[chain];
     let tokenImpl;
     if (chain === 'BSC') {
-        if (taxedV5 || taxedV3) {
-            // ✅ V5 高级税代币（含 vault）使用新的实现地址
+        if (taxedV3) {
+            tokenImpl = FLAP_TOKEN_IMPL_ADDRESSES.BSC_TAXED_V3;
+        }
+        else if (taxedV5) {
             tokenImpl = FLAP_TOKEN_IMPL_ADDRESSES.BSC_TAXED_V5;
         }
         else if (useV3Permit) {
@@ -59,7 +62,7 @@ export async function findSaltEnding(opts) {
     // 若未提供 seed，默认使用随机种子，避免每次结果都相同
     let salt = opts.seed ?? keccak256(randomBytes(32));
     let iterations = 0;
-    const limit = opts.maxIterations ?? 1_000_000;
+    const limit = opts.maxIterations ?? 1000000;
     while (iterations < limit) {
         const addr = predictVanityTokenAddress(salt, opts.portal, opts.tokenImpl);
         if (addr.toLowerCase().endsWith(suffix)) {
@@ -76,15 +79,18 @@ export async function findSaltEnding(opts) {
  * 注意：使用 Flap 平台的原始 Portal 地址进行 CREATE2 计算
  * BSC/MONAD 默认使用 NORMAL 实现（非税版）
  * XLayer 只有标准版，后缀是 1111
- * @param taxedV5 - 是否使用 V5 高级税代币实现 (mkt/deflation/dividend/lp)
+ * @param taxedV5 - Legacy V5 impl
+ * @param taxedV3 - TOKEN_TAXED_V3 impl（推荐）
  */
 export async function findSaltEndingByChain(opts) {
     // 使用 Flap 平台的原始 Portal 地址（用于 CREATE2）
     const portal = FLAP_ORIGINAL_PORTAL_ADDRESSES[opts.chain];
     let tokenImpl;
     if (opts.chain === 'BSC') {
-        if (opts.taxedV5 || opts.taxedV3) {
-            // ✅ V5 高级税代币（含 vault）使用新的实现地址
+        if (opts.taxedV3) {
+            tokenImpl = FLAP_TOKEN_IMPL_ADDRESSES.BSC_TAXED_V3;
+        }
+        else if (opts.taxedV5) {
             tokenImpl = FLAP_TOKEN_IMPL_ADDRESSES.BSC_TAXED_V5;
         }
         else if (opts.useV3Permit) {
@@ -104,13 +110,13 @@ export async function findSaltEndingByChain(opts) {
     if (!portal || !tokenImpl) {
         throw new Error(`Flap Protocol not fully deployed on ${opts.chain}`);
     }
-    // ✅ 如果未指定后缀，根据链自动选择正确的后缀（税代币 / V5 / V3 vault 均使用 tax 后缀）
-    const suffix = opts.suffix ?? getVanitySuffix(opts.chain, opts.taxed || opts.taxedV5 || opts.taxedV3);
+    // ✅ 如果未指定后缀，根据链自动选择正确的后缀
+    const suffix = opts.suffix ?? getVanitySuffix(opts.chain, opts.taxed);
     return findSaltEnding({
         portal,
         tokenImpl,
         suffix,
         maxIterations: opts.maxIterations,
-        seed: opts.seed,
+        seed: opts.seed
     });
 }