four-flap-meme-sdk 1.6.67 → 1.6.68

package/dist/xlayer/bundle-buy-first.js

@@ -17,8 +17,8 @@ import { createAAAccountManager, encodeExecute, createWallet } from './aa-accoun
 import { encodeBuyCall, encodeSellCall, PortalQuery, lpFeeProfileToV3Fee } from './portal-ops.js';
 import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, } from './dex.js';
 import { encodeApproveCall } from './portal-ops.js';
-import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, } from './constants.js';
-import { PROFIT_CONFIG } from '../utils/constants.js';
+import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, } from './constants.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
 // 工具函数
@@ -63,6 +63,69 @@ function normalizeConfig(cfg) {
     };
 }
 // ============================================================================
+// V3 报价工具函数
+// ============================================================================
+const V3_FACTORY_ABI = [
+    'function getPool(address tokenA, address tokenB, uint24 fee) view returns (address pool)',
+];
+const V3_POOL_ABI = [
+    'function slot0() view returns (uint160 sqrtPriceX96,int24 tick,uint16 observationIndex,uint16 observationCardinality,uint16 observationCardinalityNext,uint8 feeProtocol,bool unlocked)',
+    'function token0() view returns (address)',
+    'function token1() view returns (address)',
+];
+const V3_FEE_DENOMINATOR = 1000000n;
+/**
+ * 使用 V3 Pool 的 slot0 获取 Token → WOKB 的报价（卖出方向）
+ */
+async function quoteV3SellViaSlot0(params) {
+    try {
+        const { rpcUrl, tokenAddress, tokenAmount, fee } = params;
+        if (!tokenAddress || tokenAmount <= 0n)
+            return 0n;
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const wokbLower = WOKB.toLowerCase();
+        const tokenLower = tokenAddress.toLowerCase();
+        if (wokbLower === tokenLower)
+            return tokenAmount;
+        const factory = new ethers.Contract(POTATOSWAP_V3_FACTORY, V3_FACTORY_ABI, provider);
+        const poolAddr = await factory.getPool(tokenAddress, WOKB, fee);
+        if (!poolAddr || poolAddr.toLowerCase() === ZERO_ADDRESS.toLowerCase())
+            return 0n;
+        const pool = new ethers.Contract(poolAddr, V3_POOL_ABI, provider);
+        const [t0, t1, slot0] = await Promise.all([pool.token0(), pool.token1(), pool.slot0()]);
+        if (!t0 || !t1 || !slot0)
+            return 0n;
+        const sqrtPriceX96 = BigInt(slot0[0]);
+        if (sqrtPriceX96 <= 0n)
+            return 0n;
+        // 扣除手续费
+        const amountInLessFee = (tokenAmount * (V3_FEE_DENOMINATOR - BigInt(fee))) / V3_FEE_DENOMINATOR;
+        if (amountInLessFee <= 0n)
+            return 0n;
+        const Q192 = 2n ** 192n;
+        const num = sqrtPriceX96 * sqrtPriceX96;
+        const t0Lower = String(t0).toLowerCase();
+        const t1Lower = String(t1).toLowerCase();
+        // sqrtPriceX96 表示 token1/token0 的现货价
+        // 卖出方向：Token → WOKB
+        if (tokenLower === t0Lower && wokbLower === t1Lower) {
+            // Token 是 token0，WOKB 是 token1
+            // price = token1/token0 = WOKB/Token, 所以 wokbOut = tokenIn * price = tokenIn * num / Q192
+            return (amountInLessFee * num) / Q192;
+        }
+        if (tokenLower === t1Lower && wokbLower === t0Lower) {
+            // Token 是 token1，WOKB 是 token0
+            // price = token1/token0 = Token/WOKB, 所以 wokbOut = tokenIn / price = tokenIn * Q192 / num
+            return (amountInLessFee * Q192) / num;
+        }
+        return 0n;
+    }
+    catch (e) {
+        console.warn('[quoteV3SellViaSlot0] 报价失败:', e);
+        return 0n;
+    }
+}
+// ============================================================================
 // 买入 UserOps 构建
 // ============================================================================
 /**
@@ -337,6 +400,21 @@ export async function buildBundleSellOps(params) {
             targetContract = portal;
         }
         else if (poolType === 'v3') {
+            // ✅ V3 卖出报价：使用 slot0 计算预期输出，并应用 2% 滑点保护
+            let amountOutMinimum = 0n;
+            try {
+                const quotedOut = await quoteV3SellViaSlot0({
+                    rpcUrl: config.rpcUrl,
+                    tokenAddress: params.tokenAddress,
+                    tokenAmount: sellAmount,
+                    fee: v3Fee,
+                });
+                // 应用 2% 滑点保护
+                amountOutMinimum = (quotedOut * 98n) / 100n;
+            }
+            catch (e) {
+                console.warn(`[buildBundleSellOps] V3 卖出报价失败，使用 amountOutMinimum=0:`, e);
+            }
             swapData = encodeSwapExactTokensForETHV3({
                 tokenIn: params.tokenAddress,
                 tokenOut: wokb,
@@ -345,7 +423,7 @@ export async function buildBundleSellOps(params) {
                 unwrapRecipient: sender,
                 deadline,
                 amountIn: sellAmount,
-                amountOutMinimum: 0n,
+                amountOutMinimum,
                 sqrtPriceLimitX96: 0n,
             });
             targetContract = routerAddress;

package/dist/xlayer/wash-ops.js

@@ -16,10 +16,73 @@ import { ethers } from 'ethers';
 import { createAAAccountManager, encodeExecute, createWallet } from './aa-account.js';
 import { encodeBuyCall, encodeSellCall, PortalQuery, lpFeeProfileToV3Fee } from './portal-ops.js';
 import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactETHForTokensV3, encodeSwapExactTokensForETHV3, DexQuery, } from './dex.js';
-import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, } from './constants.js';
-import { PROFIT_CONFIG } from '../utils/constants.js';
+import { FLAP_PORTAL, WOKB, XLAYER_CHAIN_ID, DEFAULT_RPC_URL, ENTRYPOINT_V06, SIMPLE_ACCOUNT_FACTORY, PARTICLE_BUNDLER_URL, POTATOSWAP_V2_ROUTER, POTATOSWAP_V3_ROUTER, POTATOSWAP_V3_FACTORY, } from './constants.js';
+import { PROFIT_CONFIG, ZERO_ADDRESS } from '../utils/constants.js';
 import { mapWithConcurrency } from '../utils/concurrency.js';
 // ============================================================================
+// V3 报价工具函数
+// ============================================================================
+const V3_FACTORY_ABI = [
+    'function getPool(address tokenA, address tokenB, uint24 fee) view returns (address pool)',
+];
+const V3_POOL_ABI = [
+    'function slot0() view returns (uint160 sqrtPriceX96,int24 tick,uint16 observationIndex,uint16 observationCardinality,uint16 observationCardinalityNext,uint8 feeProtocol,bool unlocked)',
+    'function token0() view returns (address)',
+    'function token1() view returns (address)',
+];
+const V3_FEE_DENOMINATOR = 1000000n;
+/**
+ * 使用 V3 Pool 的 slot0 获取 WOKB → Token 的报价（买入方向）
+ */
+async function quoteV3BuyViaSlot0(params) {
+    try {
+        const { rpcUrl, tokenAddress, wokbAmount, fee } = params;
+        if (!tokenAddress || wokbAmount <= 0n)
+            return 0n;
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const wokbLower = WOKB.toLowerCase();
+        const tokenLower = tokenAddress.toLowerCase();
+        if (wokbLower === tokenLower)
+            return wokbAmount;
+        const factory = new ethers.Contract(POTATOSWAP_V3_FACTORY, V3_FACTORY_ABI, provider);
+        const poolAddr = await factory.getPool(tokenAddress, WOKB, fee);
+        if (!poolAddr || poolAddr.toLowerCase() === ZERO_ADDRESS.toLowerCase())
+            return 0n;
+        const pool = new ethers.Contract(poolAddr, V3_POOL_ABI, provider);
+        const [t0, t1, slot0] = await Promise.all([pool.token0(), pool.token1(), pool.slot0()]);
+        if (!t0 || !t1 || !slot0)
+            return 0n;
+        const sqrtPriceX96 = BigInt(slot0[0]);
+        if (sqrtPriceX96 <= 0n)
+            return 0n;
+        // 扣除手续费
+        const amountInLessFee = (wokbAmount * (V3_FEE_DENOMINATOR - BigInt(fee))) / V3_FEE_DENOMINATOR;
+        if (amountInLessFee <= 0n)
+            return 0n;
+        const Q192 = 2n ** 192n;
+        const num = sqrtPriceX96 * sqrtPriceX96;
+        const t0Lower = String(t0).toLowerCase();
+        const t1Lower = String(t1).toLowerCase();
+        // sqrtPriceX96 表示 token1/token0 的现货价
+        // 买入方向：WOKB → Token
+        if (wokbLower === t0Lower && tokenLower === t1Lower) {
+            // WOKB 是 token0，Token 是 token1
+            // price = token1/token0, 所以 tokenOut = wokbIn * price = wokbIn * num / Q192
+            return (amountInLessFee * num) / Q192;
+        }
+        if (wokbLower === t1Lower && tokenLower === t0Lower) {
+            // WOKB 是 token1，Token 是 token0
+            // price = token1/token0 = WOKB/Token, 所以 tokenOut = wokbIn / price = wokbIn * Q192 / num
+            return (amountInLessFee * Q192) / num;
+        }
+        return 0n;
+    }
+    catch (e) {
+        console.warn('[quoteV3BuyViaSlot0] 报价失败:', e);
+        return 0n;
+    }
+}
+// ============================================================================
 // 工具函数
 // ============================================================================
 /**
@@ -203,13 +266,19 @@ export async function buildWashOps(params) {
         });
     }
     else if (poolType === 'v3') {
-        // V3 使用 Portal 的 quoteExactInput 作为 fallback（理想情况下应使用 Quoter 合约）
-        const portalQuery = new PortalQuery({ rpcUrl: config.rpcUrl, chainId: config.chainId });
+        // ✅ V3 使用 slot0 现货价计算预期代币输出（与 dex-bundle-swap 保持一致）
         expectedTokenAmounts = await mapWithConcurrency(buyWeiList, 4, async (buyWei) => {
             if (buyWei <= 0n)
                 return 0n;
             try {
-                return await portalQuery.quoteExactInput(wokb, params.tokenAddress, buyWei);
+                const quoted = await quoteV3BuyViaSlot0({
+                    rpcUrl: config.rpcUrl,
+                    tokenAddress: params.tokenAddress,
+                    wokbAmount: buyWei,
+                    fee: v3Fee,
+                });
+                // 应用 2% 滑点保护，避免因价格波动导致卖出失败
+                return (quoted * 98n) / 100n;
             }
             catch {
                 return 0n;
@@ -276,6 +345,7 @@ export async function buildWashOps(params) {
                 fee: v3Fee,
                 recipient: sender, // ✅ 使用已验证的 sender 变量
                 unwrapRecipient: sender, // ✅ 使用已验证的 sender 变量
+                routerAddress, // ✅ 传递正确的 Router 地址
                 deadline,
                 amountIn: expectedTokenAmount,
                 amountOutMinimum: 0n,

package/package.json

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