four-flap-meme-sdk 1.5.82 → 1.5.84

package/dist/xlayer/bundle.js

@@ -1551,24 +1551,33 @@ export class BundleExecutor {
      * 自动计算剩余毕业容量，将钱包分为内盘和外盘组，生成签名的交易列表
      */
     async bundleGraduateBuy(params) {
-        const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, config = {} } = params;
+        const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, config = {}, graduationAmount, curveAddresses, dexAddresses } = params;
         const aaManager = this.getAAManager();
         const provider = aaManager.getProvider();
         // 1. 获取代币状态，动态计算毕业容量
         const tokenState = await this.portalQuery.getTokenV7(tokenAddress);
-        // ✅ 内联曲线公式计算毕业容量 (CDPV2)
-        // 储备量 R = k / (10亿 + h - 供应量 S) - r
-        const r = tokenState.r; // 衰减因子
-        const h = tokenState.h; // 初始高度
-        const k = tokenState.k; // 缩放系数
-        const dexSupplyThresh = tokenState.dexSupplyThresh;
-        const BILLION_WEI = 1000000000n * 10n ** 18n;
-        const denom = BILLION_WEI + h - dexSupplyThresh;
-        const graduationReserveWei = denom > 0n ? (k * 10n ** 18n) / denom - r : 0n;
+        // ✅ 使用 progress (uint256, 1e18) 计算毕业储备量，这是最可靠的方式
+        let graduationReserveWei = 0n;
+        if (tokenState.status === 4) {
+            graduationReserveWei = tokenState.reserve;
+        }
+        else if (tokenState.progress > 0n) {
+            // graduationReserve = currentReserve / progress
+            graduationReserveWei = (tokenState.reserve * 10n ** 18n) / tokenState.progress;
+        }
+        else {
+            // 如果 progress 为 0 (刚开始)，回退到曲线公式
+            const BILLION_WEI = 1000000000n * 10n ** 18n;
+            const denom = BILLION_WEI + tokenState.h - tokenState.dexSupplyThresh;
+            graduationReserveWei = denom > 0n ? (tokenState.k * 10n ** 18n) / denom - tokenState.r : 0n;
+        }
         // 剩余毕业金额 = 毕业阈值 - 当前储备（加 1.6% 手续费缓冲以覆盖 1.5% 平台费）
-        const remainingToGraduateWei = (tokenState.status === 4 || graduationReserveWei <= tokenState.reserve)
-            ? 0n
-            : ((graduationReserveWei - tokenState.reserve) * 1016n / 1000n);
+        // ✅ 优先使用前端传入的 graduationAmount
+        const remainingToGraduateWei = graduationAmount !== undefined
+            ? ethers.parseEther(graduationAmount.toString())
+            : ((tokenState.status === 4 || graduationReserveWei <= tokenState.reserve)
+                ? 0n
+                : ((graduationReserveWei - tokenState.reserve) * 1016n / 1000n));
         const graduationReserveStr = ethers.formatEther(graduationReserveWei);
         const poolReserveOkbStr = ethers.formatEther(tokenState.reserve);
         const remainingStr = ethers.formatEther(remainingToGraduateWei);
@@ -1605,71 +1614,111 @@ export class BundleExecutor {
             const amountWei = ethers.parseEther(finalAmounts[i].toFixed(18));
             const tasks = [];
             let isTrigger = false;
-            if (currentCurveTotal < remainingToGraduateWei) {
-                const needed = remainingToGraduateWei - currentCurveTotal;
-                if (amountWei <= needed) {
-                    // 情况 A：全在内盘
-                    tasks.push({
-                        target: FLAP_PORTAL,
-                        amount: amountWei,
-                        data: encodeBuyCall(tokenAddress, amountWei, 0n)
-                    });
-                    currentCurveTotal += amountWei;
-                    if (currentCurveTotal >= remainingToGraduateWei)
-                        isTrigger = true;
-                }
-                else {
-                    // 情况 B：跨内外盘（原子化拆分）
-                    tasks.push({
-                        target: FLAP_PORTAL,
-                        amount: needed,
-                        data: encodeBuyCall(tokenAddress, needed, 0n)
-                    });
-                    isTrigger = true; // 肯定是毕业触发者
-                    currentCurveTotal = remainingToGraduateWei;
-                    if (enableDexBuy) {
-                        const excess = amountWei - needed;
-                        const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
-                        const deadline = Math.floor(Date.now() / 1000) + 1200;
-                        let swapData;
-                        let routerAddress;
-                        if (dexType === 'V3') {
-                            routerAddress = POTATOSWAP_V3_ROUTER;
-                            swapData = encodeSwapExactETHForTokensV3({
-                                tokenIn: WOKB, tokenOut: tokenAddress,
-                                fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
-                                recipient: ZERO_ADDRESS, // AA 内部 call，最终由 execute/executeBatch 决定 recipient
-                                deadline, amountIn: excess, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
-                            });
-                        }
-                        else {
-                            routerAddress = POTATOSWAP_V2_ROUTER;
-                            swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
-                        }
-                        tasks.push({ target: routerAddress, amount: excess, data: swapData });
+            // ✅ 优先判断地址分组（由前端强制指定）
+            const forceCurve = curveAddresses?.some(a => a.toLowerCase() === wallet.address.toLowerCase());
+            const forceDex = dexAddresses?.some(a => a.toLowerCase() === wallet.address.toLowerCase());
+            if (forceCurve) {
+                // 强制内盘
+                tasks.push({
+                    target: FLAP_PORTAL,
+                    amount: amountWei,
+                    data: encodeBuyCall(tokenAddress, amountWei, 0n)
+                });
+                currentCurveTotal += amountWei;
+                if (currentCurveTotal >= remainingToGraduateWei)
+                    isTrigger = true;
+            }
+            else if (forceDex) {
+                // 强制外盘
+                if (enableDexBuy) {
+                    const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
+                    const deadline = Math.floor(Date.now() / 1000) + 1200;
+                    let swapData;
+                    let routerAddress;
+                    if (dexType === 'V3') {
+                        routerAddress = POTATOSWAP_V3_ROUTER;
+                        swapData = encodeSwapExactETHForTokensV3({
+                            tokenIn: WOKB, tokenOut: tokenAddress,
+                            fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
+                            recipient: ZERO_ADDRESS,
+                            deadline, amountIn: amountWei, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
+                        });
+                    }
+                    else {
+                        routerAddress = POTATOSWAP_V2_ROUTER;
+                        swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
                     }
+                    tasks.push({ target: routerAddress, amount: amountWei, data: swapData });
                 }
             }
-            else if (enableDexBuy) {
-                // 情况 C：全在外盘
-                const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
-                const deadline = Math.floor(Date.now() / 1000) + 1200;
-                let swapData;
-                let routerAddress;
-                if (dexType === 'V3') {
-                    routerAddress = POTATOSWAP_V3_ROUTER;
-                    swapData = encodeSwapExactETHForTokensV3({
-                        tokenIn: WOKB, tokenOut: tokenAddress,
-                        fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
-                        recipient: ZERO_ADDRESS,
-                        deadline, amountIn: amountWei, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
-                    });
+            else {
+                // 兜底逻辑：自动分配 (无强制分组)
+                if (currentCurveTotal < remainingToGraduateWei) {
+                    const needed = remainingToGraduateWei - currentCurveTotal;
+                    if (amountWei <= needed) {
+                        // 情况 A：全在内盘
+                        tasks.push({
+                            target: FLAP_PORTAL,
+                            amount: amountWei,
+                            data: encodeBuyCall(tokenAddress, amountWei, 0n)
+                        });
+                        currentCurveTotal += amountWei;
+                        if (currentCurveTotal >= remainingToGraduateWei)
+                            isTrigger = true;
+                    }
+                    else {
+                        // 情况 B：跨内外盘（原子化拆分）
+                        tasks.push({
+                            target: FLAP_PORTAL,
+                            amount: needed,
+                            data: encodeBuyCall(tokenAddress, needed, 0n)
+                        });
+                        isTrigger = true;
+                        currentCurveTotal = remainingToGraduateWei;
+                        if (enableDexBuy) {
+                            const excess = amountWei - needed;
+                            const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
+                            const deadline = Math.floor(Date.now() / 1000) + 1200;
+                            let swapData;
+                            let routerAddress;
+                            if (dexType === 'V3') {
+                                routerAddress = POTATOSWAP_V3_ROUTER;
+                                swapData = encodeSwapExactETHForTokensV3({
+                                    tokenIn: WOKB, tokenOut: tokenAddress,
+                                    fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
+                                    recipient: ZERO_ADDRESS,
+                                    deadline, amountIn: excess, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
+                                });
+                            }
+                            else {
+                                routerAddress = POTATOSWAP_V2_ROUTER;
+                                swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
+                            }
+                            tasks.push({ target: routerAddress, amount: excess, data: swapData });
+                        }
+                    }
                 }
-                else {
-                    routerAddress = POTATOSWAP_V2_ROUTER;
-                    swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
+                else if (enableDexBuy) {
+                    // 情况 C：全在外盘
+                    const dexType = (tokenState.lpFeeProfile >= 0 && tokenState.tokenVersion >= 4) ? 'V3' : 'V2';
+                    const deadline = Math.floor(Date.now() / 1000) + 1200;
+                    let swapData;
+                    let routerAddress;
+                    if (dexType === 'V3') {
+                        routerAddress = POTATOSWAP_V3_ROUTER;
+                        swapData = encodeSwapExactETHForTokensV3({
+                            tokenIn: WOKB, tokenOut: tokenAddress,
+                            fee: lpFeeProfileToV3Fee(tokenState.lpFeeProfile),
+                            recipient: ZERO_ADDRESS,
+                            deadline, amountIn: amountWei, amountOutMinimum: 0n, sqrtPriceLimitX96: 0n
+                        });
+                    }
+                    else {
+                        routerAddress = POTATOSWAP_V2_ROUTER;
+                        swapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ZERO_ADDRESS, deadline);
+                    }
+                    tasks.push({ target: routerAddress, amount: amountWei, data: swapData });
                 }
-                tasks.push({ target: routerAddress, amount: amountWei, data: swapData });
             }
             if (tasks.length > 0) {
                 buyerTasks.push({ wallet, calls: tasks, isGraduationTrigger: isTrigger });

package/dist/xlayer/constants.d.ts

@@ -69,7 +69,7 @@ export declare const ENTRYPOINT_ABI: readonly ["function getNonce(address sender
 /** SimpleAccount ABI */
 export declare const SIMPLE_ACCOUNT_ABI: readonly ["function execute(address dest, uint256 value, bytes func) external", "function executeBatch(address[] calldata dest, bytes[] calldata func) external", "function executeBatch(address[] calldata dest, uint256[] calldata values, bytes[] calldata func) external"];
 /** Flap Portal ABI */
-export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function buy(address token, address to, uint256 minAmount) external payable returns (uint256)", "function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)", "function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)", "function previewBuy(address token, uint256 ethAmount) external view returns (uint256)", "function previewSell(address token, uint256 tokenAmount) external view returns (uint256)", "function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))", "function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint8,uint8))", "function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) 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) params) 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) params) external payable returns (address)"];
+export declare const PORTAL_ABI: readonly ["function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData) params) payable returns (uint256)", "function buy(address token, address to, uint256 minAmount) external payable returns (uint256)", "function sell(address token, uint256 amount, uint256 minEth) external returns (uint256)", "function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external returns (uint256)", "function previewBuy(address token, uint256 ethAmount) external view returns (uint256)", "function previewSell(address token, uint256 tokenAmount) external view returns (uint256)", "function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))", "function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint256,address,uint256,uint8,uint8))", "function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) 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) params) 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) params) external payable returns (address)"];
 /** ERC20 ABI */
 export declare const ERC20_ABI: readonly ["function balanceOf(address account) view returns (uint256)", "function allowance(address owner, address spender) view returns (uint256)", "function approve(address spender, uint256 amount) returns (bool)", "function transfer(address to, uint256 amount) returns (bool)", "function decimals() view returns (uint8)", "function symbol() view returns (string)", "function name() view returns (string)"];
 /** PotatoSwap V2 Router ABI */

package/dist/xlayer/constants.js

@@ -113,7 +113,7 @@ export const PORTAL_ABI = [
     'function previewBuy(address token, uint256 ethAmount) external view returns (uint256)',
     'function previewSell(address token, uint256 tokenAmount) external view returns (uint256)',
     'function getTokenV5(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32))',
-    'function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint8,uint8))',
+    'function getTokenV7(address token) external view returns ((uint8,uint256,uint256,uint256,uint8,uint256,uint256,uint256,uint256,address,bool,bytes32,uint256,address,uint256,uint8,uint8))',
     'function newTokenV2((string name,string symbol,string meta,uint8 dexThresh,bytes32 salt,uint16 taxRate,uint8 migratorType,address quoteToken,uint256 quoteAmt,address beneficiary,bytes permitData) params) 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) params) 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) params) external payable returns (address)',

package/dist/xlayer/portal-ops.d.ts

@@ -181,8 +181,11 @@ export declare class PortalQuery {
         quoteTokenAddress: string;
         nativeToQuoteSwapEnabled: boolean;
         extensionID: string;
-        dexId: number;
+        taxRate: bigint;
+        pool: string;
+        progress: bigint;
         lpFeeProfile: number;
+        dexId: number;
     }>;
     /**
      * 批量获取多个账户的代币余额

package/dist/xlayer/portal-ops.js

@@ -216,8 +216,11 @@ export class PortalQuery {
             quoteTokenAddress: raw[9],
             nativeToQuoteSwapEnabled: raw[10],
             extensionID: raw[11],
-            dexId: Number(raw[12]),
-            lpFeeProfile: Number(raw[13]),
+            taxRate: raw[12],
+            pool: raw[13],
+            progress: raw[14],
+            lpFeeProfile: Number(raw[15]),
+            dexId: Number(raw[16]),
         };
     }
     /**

package/dist/xlayer/types.d.ts

@@ -868,6 +868,12 @@ export interface BundleGraduateBuyParams {
     payerStartNonce?: number;
     /** beneficiary（默认 payer 地址） */
     beneficiary?: string;
+    /** 毕业剩余量覆盖 (OKB 数值，不传则自动探测) */
+    graduationAmount?: number;
+    /** 预设内盘钱包地址列表 (若提供则强制按此分组) */
+    curveAddresses?: string[];
+    /** 预设外盘钱包地址列表 (若提供则强制按此分组) */
+    dexAddresses?: string[];
 }
 /**
  * 捆绑买到毕业签名结果

package/package.json

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