four-flap-meme-sdk 1.6.76 → 1.6.79

package/dist/flap/portal-bundle-merkle/encryption.d.ts

@@ -0,0 +1,16 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
+/**
+ * 验证公钥格式（Base64）
+ */
+export declare function validatePublicKey(publicKeyBase64: string): boolean;

package/dist/flap/portal-bundle-merkle/encryption.js

@@ -0,0 +1,146 @@
+/**
+ * ECDH + AES-GCM 加密工具（浏览器兼容）
+ * 用于将签名交易用服务器公钥加密
+ */
+/**
+ * 获取全局 crypto 对象（最简单直接的方式）
+ */
+function getCryptoAPI() {
+    // 尝试所有可能的全局对象，优先浏览器环境
+    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
+        (typeof self !== 'undefined' && self.crypto) ||
+        (typeof global !== 'undefined' && global.crypto) ||
+        (typeof globalThis !== 'undefined' && globalThis.crypto);
+    if (!cryptoObj) {
+        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
+            '请确保在 HTTPS 或 localhost 下运行');
+    }
+    return cryptoObj;
+}
+/**
+ * 获取 SubtleCrypto（用于加密操作）
+ */
+function getSubtleCrypto() {
+    const crypto = getCryptoAPI();
+    if (!crypto.subtle) {
+        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
+        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
+        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
+            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
+            '3) 不在无痕/隐私浏览模式下');
+    }
+    return crypto.subtle;
+}
+/**
+ * Base64 转 ArrayBuffer（优先使用浏览器 API）
+ */
+function base64ToArrayBuffer(base64) {
+    // 浏览器环境（优先）
+    if (typeof atob !== 'undefined') {
+        const binaryString = atob(base64);
+        const bytes = new Uint8Array(binaryString.length);
+        for (let i = 0; i < binaryString.length; i++) {
+            bytes[i] = binaryString.charCodeAt(i);
+        }
+        return bytes.buffer;
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(base64, 'base64').buffer;
+    }
+    throw new Error('❌ Base64 解码不可用');
+}
+/**
+ * ArrayBuffer 转 Base64（优先使用浏览器 API）
+ */
+function arrayBufferToBase64(buffer) {
+    // 浏览器环境（优先）
+    if (typeof btoa !== 'undefined') {
+        const bytes = new Uint8Array(buffer);
+        let binary = '';
+        for (let i = 0; i < bytes.length; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);
+    }
+    // Node.js 环境（fallback）
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(buffer).toString('base64');
+    }
+    throw new Error('❌ Base64 编码不可用');
+}
+/**
+ * 生成随机 Hex 字符串
+ */
+function randomHex(length) {
+    const crypto = getCryptoAPI();
+    const array = new Uint8Array(length);
+    crypto.getRandomValues(array);
+    return Array.from(array)
+        .map(b => b.toString(16).padStart(2, '0'))
+        .join('');
+}
+/**
+ * 用服务器公钥加密签名交易（ECDH + AES-GCM）
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
+ * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
+ */
+export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
+    try {
+        // 0. 获取 SubtleCrypto 和 Crypto API
+        const subtle = getSubtleCrypto();
+        const crypto = getCryptoAPI();
+        // 1. 准备数据
+        const payload = {
+            signedTransactions,
+            timestamp: Date.now(),
+            nonce: randomHex(8)
+        };
+        const plaintext = JSON.stringify(payload);
+        // 2. 生成临时 ECDH 密钥对
+        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
+        // 3. 导入服务器公钥
+        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
+        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
+        // 4. 派生共享密钥（AES-256）
+        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
+        // 5. AES-GCM 加密
+        const iv = crypto.getRandomValues(new Uint8Array(12));
+        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
+        // 6. 导出临时公钥
+        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
+        // 7. 返回加密包（JSON 格式）
+        return JSON.stringify({
+            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
+            i: arrayBufferToBase64(iv.buffer), // IV
+            d: arrayBufferToBase64(encrypted) // 密文
+        });
+    }
+    catch (error) {
+        throw new Error(`加密失败: ${error?.message || String(error)}`);
+    }
+}
+/**
+ * 验证公钥格式（Base64）
+ */
+export function validatePublicKey(publicKeyBase64) {
+    try {
+        if (!publicKeyBase64)
+            return false;
+        // Base64 字符集验证
+        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
+            return false;
+        // ECDH P-256 公钥固定长度 65 字节（未压缩）
+        // Base64 编码后约 88 字符
+        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
+            return false;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/utils/quote-helpers.d.ts

@@ -25,7 +25,7 @@ export declare const QUOTE_CONFIG: {
     };
     readonly XLAYER: {
         readonly v2Router: "0x881fb2f98c13d521009464e7d1cbf16e1b394e8e";
-        readonly v3Quoter: "";
+        readonly v3Quoter: "0x5A6f3723346aF54a4D0693bfC1718D64d4915C3e";
         readonly wrappedNative: "0xe538905cf8410324e03a5a23c1c177a474d59b2b";
         readonly stableCoins: readonly ["0x1E4a5963aBFD975d8c9021ce480b42188849D41d", "0x74b7f16337b8972027f6196a17a631ac6de26d22", "0x779ded0c9e1022225f8e0630b35a9b54be713736"];
     };

package/dist/utils/quote-helpers.js

@@ -35,7 +35,7 @@ export const QUOTE_CONFIG = {
     },
     XLAYER: {
         v2Router: '0x881fb2f98c13d521009464e7d1cbf16e1b394e8e', // PotatoSwap V2
-        v3Quoter: '', // TODO: 添加 XLayer V3 Quoter
+        v3Quoter: '0x5A6f3723346aF54a4D0693bfC1718D64d4915C3e', // ✅ PotatoSwap V3 QuoterV2
         wrappedNative: '0xe538905cf8410324e03a5a23c1c177a474d59b2b', // WOKB
         stableCoins: [
             '0x1E4a5963aBFD975d8c9021ce480b42188849D41d', // USDT

package/dist/xlayer/hop-wallet-manager.js

@@ -345,9 +345,6 @@ export class HopWalletManager {
             deployed: hopDeployedOnChain[i],
             balance: ethers.formatEther(hopBalances[i]),
         })));
-        // ✅ 记录 Payer nonce，避免冲突
-        let payerNonceCounter = await this.provider.getTransactionCount(payerWallet.address, 'pending');
-        const connectedPayer = payerWallet.connect(this.provider);
         for (let i = 0; i < hopWallets.length; i++) {
             const hop = hopWallets[i];
             try {
@@ -366,24 +363,23 @@ export class HopWalletManager {
                 // 增加 20% buffer 确保足够
                 const estimatedPrefund = (totalGasNeeded * gasPrice * 120n) / 100n;
                 console.log(`[HopWalletManager] Hop ${i} prefund 估算: callGas=${callGasLimit}, verifyGas=${verificationGasLimit}, preVerify=${preVerificationGas}, total=${totalGasNeeded}, prefund=${ethers.formatEther(estimatedPrefund)} OKB, balance=${ethers.formatEther(balance)} OKB, deployed=${isDeployed}`);
-                // ✅ 最小可退金额（至少要有这么多才值得退款）
-                const minRefundAmount = gasPrice * 50000n; // ~0.00005 OKB
-                // ✅ 关键改进：如果余额不足 prefund + minRefund，先让 Payer 给 Hop 充值差额
+                // ✅ 关键改进：如果余额不足 prefund，先让 Payer 给 Hop 充值差额
                 let effectiveBalance = balance;
-                const minNeededForRefund = estimatedPrefund + minRefundAmount;
-                if (balance < minNeededForRefund) {
-                    // 计算需要充值的金额（差额 + 少量 buffer，确保能退回一些）
-                    const shortfall = minNeededForRefund - balance + (gasPrice * 20000n);
+                if (balance <= estimatedPrefund) {
+                    // 计算需要充值的金额（差额 + 少量 buffer）
+                    const shortfall = estimatedPrefund - balance + (gasPrice * 10000n); // 多充一点
                     console.log(`[HopWalletManager] Hop ${i} 余额不足，需要补充: ${ethers.formatEther(shortfall)} OKB`);
                     try {
+                        // 使用 Payer 给 Hop 充值
+                        const connectedPayer = payerWallet.connect(this.provider);
+                        const payerNonce = await this.provider.getTransactionCount(payerWallet.address, 'pending');
                         const topUpTx = await connectedPayer.sendTransaction({
                             to: hop.senderAddress,
                             value: shortfall,
-                            nonce: payerNonceCounter,
+                            nonce: payerNonce,
                             gasPrice,
                             gasLimit: 21055n,
                         });
-                        payerNonceCounter++; // ✅ 递增 nonce
                         console.log(`[HopWalletManager] Hop ${i} 补充转账已发送: ${topUpTx.hash}`);
                         // 等待确认
                         const receipt = await topUpTx.wait();
@@ -405,16 +401,6 @@ export class HopWalletManager {
                     }
                 }
                 const refundAmount = effectiveBalance - estimatedPrefund;
-                // ✅ 安全检查：确保退款金额为正数
-                if (refundAmount <= 0n) {
-                    console.warn(`[HopWalletManager] Hop ${i} 退款金额为 ${refundAmount}，跳过`);
-                    hopRefunds.push({
-                        hopIndex: hop.index,
-                        refundWei: 0n,
-                        error: `退款金额不足: ${ethers.formatEther(refundAmount)} OKB`,
-                    });
-                    continue;
-                }
                 const initCode = isDeployed ? '0x' : hop.initCode;
                 // 构建 UserOp
                 const hopWallet = new Wallet(hop.privateKey, this.provider);
@@ -469,6 +455,7 @@ export class HopWalletManager {
         });
         // 发送 handleOps
         try {
+            const connectedPayer = payerWallet.connect(this.provider);
             const entryPointAddress = this.aaManager.getEntryPointAddress();
             // ✅ 直接创建新 Contract 实例（跟其他地方一样）
             const entryPointWithSigner = new ethers.Contract(entryPointAddress, ['function handleOps((address sender,uint256 nonce,bytes initCode,bytes callData,uint256 callGasLimit,uint256 verificationGasLimit,uint256 preVerificationGas,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,bytes paymasterAndData,bytes signature)[] ops, address payable beneficiary) external'], connectedPayer);

package/dist/xlayer/wash-ops.js

@@ -19,6 +19,7 @@ import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSu
 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';
+import { quoteV3 } from '../utils/quote-helpers.js';
 // ============================================================================
 // V3 报价工具函数
 // ============================================================================
@@ -266,18 +267,15 @@ export async function buildWashOps(params) {
         });
     }
     else if (poolType === 'v3') {
-        // ✅ V3 报价：使用 slot0 现货价（不加安全边际，确保卖干净）
+        // ✅ V3 报价：使用 V3 Quoter（和 BSC 一样，考虑价格影响，获取准确报价）
+        // PotatoSwap V3 QuoterV2: 0x5A6f3723346aF54a4D0693bfC1718D64d4915C3e
+        const provider = new ethers.JsonRpcProvider(config.rpcUrl, { chainId: config.chainId, name: 'xlayer' });
         expectedTokenAmounts = await mapWithConcurrency(buyWeiList, 4, async (buyWei) => {
             if (buyWei <= 0n)
                 return 0n;
             try {
-                // 直接使用 slot0 现货价（无币模式需要卖干净，不留残余）
-                return await quoteV3BuyViaSlot0({
-                    rpcUrl: config.rpcUrl,
-                    tokenAddress: params.tokenAddress,
-                    wokbAmount: buyWei,
-                    fee: v3Fee,
-                });
+                const result = await quoteV3(provider, wokb, params.tokenAddress, buyWei, 'XLAYER', v3Fee);
+                return result.amountOut;
             }
             catch {
                 return 0n;

package/package.json

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