four-flap-meme-sdk 1.5.52 → 1.5.54

package/dist/xlayer/userOp-builder.d.ts

@@ -0,0 +1,51 @@
+/**
+ * XLayer AA UserOp 批量构建器
+ */
+import type { Wallet } from 'ethers';
+import type { AAAccountManager } from './aa-account.js';
+import type { AANonceMap } from './types.js';
+import type { UserOperation, XLayerConfig } from './types.js';
+export interface BuildBuyOpsParams {
+    buyers: Wallet[];
+    buyerAis: Array<{
+        sender: string;
+        deployed: boolean;
+    }>;
+    buyAmountsWei: bigint[];
+    tokenAddress: string;
+    effectiveRouter: string;
+    deadline: number;
+    wokbAddress: string;
+    nonceMap: AANonceMap;
+    consumeInitCode: (sender: string) => string;
+    aaManager: AAAccountManager;
+    config: XLayerConfig;
+    defaultCallGasLimit: bigint;
+}
+export interface BuildSellOpsParams {
+    sellers: Wallet[];
+    sellerAis: Array<{
+        sender: string;
+        deployed: boolean;
+    }>;
+    sellAmountsWei: bigint[];
+    tokenAddress: string;
+    effectiveRouter: string;
+    deadline: number;
+    wokbAddress: string;
+    sellerAllowances: Map<string, bigint>;
+    nonceMap: AANonceMap;
+    consumeInitCode: (sender: string) => string;
+    aaManager: AAAccountManager;
+    config: XLayerConfig;
+    defaultApproveGasLimit: bigint;
+    defaultSellGasLimit: bigint;
+}
+/**
+ * ✅ 优化 1: 并行构建所有买入 UserOp
+ */
+export declare function buildBuyUserOps(params: BuildBuyOpsParams): Promise<UserOperation[]>;
+/**
+ * ✅ 优化 3: 合并 Approve 和 Sell
+ */
+export declare function buildSellUserOps(params: BuildSellOpsParams): Promise<UserOperation[]>;

package/dist/xlayer/userOp-builder.js

@@ -0,0 +1,97 @@
+/**
+ * XLayer AA UserOp 批量构建器
+ */
+import { ethers } from 'ethers';
+import { encodeExecute, encodeExecuteBatch } from './aa-account.js';
+import { encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee } from './dex.js';
+import { encodeApproveCall, parseOkb } from './portal-ops.js';
+/**
+ * ✅ 优化 1: 并行构建所有买入 UserOp
+ */
+export async function buildBuyUserOps(params) {
+    const { buyers, buyerAis, buyAmountsWei, tokenAddress, effectiveRouter, deadline, wokbAddress, nonceMap, consumeInitCode, aaManager, config, defaultCallGasLimit } = params;
+    const buyOpPromises = buyers.map(async (w, i) => {
+        const ai = buyerAis[i];
+        const sender = ai.sender;
+        const buyWei = buyAmountsWei[i] ?? 0n;
+        if (buyWei <= 0n)
+            return null;
+        const swapData = encodeSwapExactETHForTokensSupportingFee(0n, [wokbAddress, tokenAddress], sender, deadline);
+        const callData = encodeExecute(effectiveRouter, buyWei, swapData);
+        const { userOp, prefundWei } = await aaManager.buildUserOpWithFixedGas({
+            ownerWallet: w,
+            sender,
+            nonce: nonceMap.next(sender),
+            initCode: consumeInitCode(sender),
+            callData,
+            deployed: ai.deployed,
+            fixedGas: {
+                ...(config.fixedGas ?? {}),
+                callGasLimit: config.fixedGas?.callGasLimit ?? defaultCallGasLimit,
+            },
+        });
+        await aaManager.ensureSenderBalance(w, sender, buyWei + prefundWei + parseOkb('0.0001'), `buyFirstDex/buyer${i + 1}/fund`);
+        const signed = await aaManager.signUserOp(userOp, w);
+        return signed.userOp;
+    });
+    const ops = await Promise.all(buyOpPromises);
+    return ops.filter((op) => op !== null);
+}
+/**
+ * ✅ 优化 3: 合并 Approve 和 Sell
+ */
+export async function buildSellUserOps(params) {
+    const { sellers, sellerAis, sellAmountsWei, tokenAddress, effectiveRouter, deadline, wokbAddress, sellerAllowances, nonceMap, consumeInitCode, aaManager, config, defaultApproveGasLimit, defaultSellGasLimit } = params;
+    const sellOpPromises = sellers.map(async (w, i) => {
+        const ai = sellerAis[i];
+        const sender = ai.sender;
+        const sellWei = sellAmountsWei[i] ?? 0n;
+        if (sellWei <= 0n)
+            return null;
+        const allowance = sellerAllowances.get(sender) ?? 0n;
+        const needApprove = allowance < sellWei;
+        if (needApprove) {
+            // ✅ 合并 approve + sell 到一个 UserOp
+            const approveData = encodeApproveCall(effectiveRouter, ethers.MaxUint256);
+            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellWei, 0n, [tokenAddress, wokbAddress], sender, deadline);
+            const batchCallData = encodeExecuteBatch([tokenAddress, effectiveRouter], [0n, 0n], [approveData, sellSwapData]);
+            const { userOp, prefundWei } = await aaManager.buildUserOpWithFixedGas({
+                ownerWallet: w,
+                sender,
+                nonce: nonceMap.next(sender),
+                initCode: consumeInitCode(sender),
+                callData: batchCallData,
+                deployed: ai.deployed,
+                fixedGas: {
+                    ...(config.fixedGas ?? {}),
+                    callGasLimit: config.fixedGas?.callGasLimit ?? (defaultApproveGasLimit + defaultSellGasLimit),
+                },
+            });
+            await aaManager.ensureSenderBalance(w, sender, prefundWei + parseOkb('0.0001'), `buyFirstDex/seller${i + 1}/batch-fund`);
+            const signed = await aaManager.signUserOp(userOp, w);
+            return signed.userOp;
+        }
+        else {
+            // 只需要 sell
+            const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellWei, 0n, [tokenAddress, wokbAddress], sender, deadline);
+            const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
+            const { userOp, prefundWei } = await aaManager.buildUserOpWithFixedGas({
+                ownerWallet: w,
+                sender,
+                nonce: nonceMap.next(sender),
+                initCode: consumeInitCode(sender),
+                callData: sellCallData,
+                deployed: ai.deployed,
+                fixedGas: {
+                    ...(config.fixedGas ?? {}),
+                    callGasLimit: config.fixedGas?.callGasLimit ?? defaultSellGasLimit,
+                },
+            });
+            await aaManager.ensureSenderBalance(w, sender, prefundWei + parseOkb('0.0001'), `buyFirstDex/seller${i + 1}/sell-fund`);
+            const signed = await aaManager.signUserOp(userOp, w);
+            return signed.userOp;
+        }
+    });
+    const ops = await Promise.all(sellOpPromises);
+    return ops.filter((op) => op !== null);
+}

package/package.json

@@ -1,10 +1,27 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.5.52",
+  "version": "1.5.54",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./sol": {
+      "types": "./dist/sol/index.d.ts",
+      "import": "./dist/sol/index.js",
+      "default": "./dist/sol/index.js"
+    },
+    "./sol/*": {
+      "types": "./dist/sol/*.d.ts",
+      "import": "./dist/sol/*.js",
+      "default": "./dist/sol/*.js"
+    }
+  },
   "files": [
     "dist",
     "src/abis/*.json"
@@ -29,11 +46,33 @@
     "node": ">=18"
   },
   "dependencies": {
-    "axios": "^1.12.2",
+    "@metaplex-foundation/mpl-token-metadata": "^3.4.0",
+    "@metaplex-foundation/umi": "^1.4.1",
+    "@metaplex-foundation/umi-bundle-defaults": "^1.4.1",
+    "@metaplex-foundation/umi-web3js-adapters": "^1.4.1",
+    "@meteora-ag/cp-amm-sdk": "^1.2.6",
+    "@meteora-ag/dlmm": "^1.9.0",
+    "@meteora-ag/dynamic-amm-sdk": "^1.4.1",
+    "@meteora-ag/dynamic-bonding-curve-sdk": "^1.4.9",
+    "@orca-so/common-sdk": "^0.7.0",
+    "@orca-so/whirlpools-sdk": "^0.17.4",
+    "@pump-fun/pump-sdk": "^1.24.0",
+    "@pump-fun/pump-swap-sdk": "^1.11.0",
+    "@raydium-io/raydium-sdk-v2": "^0.2.31-alpha",
+    "@solana/spl-token": "0.4.14",
+    "@solana/web3.js": "1.98.4",
+    "axios": "^1.13.2",
     "ethers": "^6.16.0",
-    "pinata": "^1.10.1"
+    "pinata": "^2.5.1",
+    "tweetnacl": "^1.0.3"
+  },
+  "optionalDependencies": {
+    "@orca-so/wavebreak": "^1.1.7"
   },
   "devDependencies": {
-    "typescript": "^5.6.3"
+    "@types/bn.js": "^5.2.0",
+    "@types/bs58": "^4.0.4",
+    "decimal.js": "^10.6.0",
+    "typescript": "^5.9.3"
   }
-}
+}

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

@@ -1,16 +0,0 @@
-/**
- * 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

@@ -1,146 +0,0 @@
-/**
- * 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;
-    }
-}