four-flap-meme-sdk 1.4.94 → 1.4.96

package/dist/abis/common.js

@@ -224,6 +224,8 @@ export const FLAP_PORTAL_ABI = [
     'function newToken(string name, string symbol, string meta) external payable returns (address)',
     '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)',
+    // ✅ V4：支持 dexId / lpFeeProfile（与 portal-bundle-merkle/core.ts 的 newTokenV4.populateTransaction 对齐）
+    '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)',
     // 交易
     'function swapExactInput((address inputToken,address outputToken,uint256 inputAmount,uint256 minOutputAmount,bytes permitData)) external payable returns (uint256)',
     'function quoteExactInput((address inputToken,address outputToken,uint256 inputAmount)) external view returns (uint256)',

package/dist/contracts/tm-bundle-merkle/config.d.ts

@@ -45,7 +45,6 @@ export declare function shouldExtractProfit(config?: FourAnyConfig): boolean;
 export declare function getProfitRateBps(config?: FourAnyConfig): number;
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export declare function getProfitRecipient(config?: FourAnyConfig): string;
 /**

package/dist/contracts/tm-bundle-merkle/config.js

@@ -74,7 +74,6 @@ export function getProfitRateBps(config) {
 }
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export function getProfitRecipient(config) {
     return PROFIT_CONFIG.RECIPIENT;

package/dist/contracts/tm-bundle-merkle/core.js

@@ -54,6 +54,9 @@ export async function createTokenWithBundleBuyMerkle(params) {
     }
     const accessToken = await loginFourClient(devWallet, fourClient);
     const imgUrl = await resolveTokenImage(fourClient, tokenInfo, accessToken);
+    // ✅ 兼容：历史调用可能把 Dev 首买金额塞在 buyAmounts[0]，而不是 tokenInfo.preSale
+    // Four 官方 API/链上 createArg 使用 preSale 表达“创建者预购金额”
+    const effectivePreSaleStr = (tokenInfo.preSale && String(tokenInfo.preSale).trim().length > 0 ? String(tokenInfo.preSale) : String(buyAmounts[0] ?? '0'));
     const createResp = await fourClient.createToken(accessToken, {
         name: tokenInfo.name,
         shortName: tokenInfo.symbol,
@@ -64,7 +67,7 @@ export async function createTokenWithBundleBuyMerkle(params) {
         webUrl: tokenInfo.webUrl,
         twitterUrl: tokenInfo.twitterUrl,
         telegramUrl: tokenInfo.telegramUrl,
-        preSale: tokenInfo.preSale || '0',
+        preSale: effectivePreSaleStr || '0',
         onlyMPC: false,
         lpTradingFee: 0.0025,
         symbol: 'BNB',
@@ -83,7 +86,8 @@ export async function createTokenWithBundleBuyMerkle(params) {
     // ✅ 单笔交易: 和 Four.meme 官网一样
     // 计算利润
     const extractProfit = shouldExtractProfit(config);
-    const originalBuyAmount = ethers.parseEther(buyAmounts[0]);
+    // ✅ 对 create 流程来说，“买入金额”就是 preSale（创建者预购）
+    const originalBuyAmount = ethers.parseEther(effectivePreSaleStr || '0');
     let actualBuyFunds;
     let profitAmount;
     if (extractProfit) {
@@ -99,13 +103,13 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const bribeAmount = getBribeAmount(config);
     const needBribeTx = bribeAmount > 0n;
     const b0AmountWei = ethers.parseEther(params.b0Amount ?? '0');
-    const preSaleWei = tokenInfo.preSale ? ethers.parseEther(tokenInfo.preSale) : 0n;
-    // ✅ 关键: value = 创建费用 + b0Amount + preSale + 买入金额
-    // Four.meme 合约会自动处理: 如果 value > 创建费用,会自动用多余的金额买入
-    const valueWei = PLATFORM_CREATE_FEE + b0AmountWei + preSaleWei + actualBuyFunds;
+    const preSaleWei = effectivePreSaleStr ? ethers.parseEther(effectivePreSaleStr) : 0n;
+    // ✅ 关键修复：
+    // createToken 的预购金额由 createArg.preSale 决定；因此这里只需要支付：创建费 + b0Amount + preSale
+    // 不要把“其它买入金额”额外塞进 msg.value，否则会被合约退回，造成“看起来没买到”的误解。
+    const valueWei = PLATFORM_CREATE_FEE + b0AmountWei + preSaleWei;
     const tmCreate = new ethers.Contract(tmCreateAddr, TM2_ABI, devWallet);
-    const createTxUnsigned = await tmCreate.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei } // ✅ 包含买入金额
-    );
+    const createTxUnsigned = await tmCreate.createToken.populateTransaction(createResp.createArg, createResp.signature, { value: valueWei });
     // ✅ 贿赂交易放在首位（由 devWallet 发送）
     let bribeNonce;
     if (needBribeTx) {
@@ -125,7 +129,7 @@ export async function createTokenWithBundleBuyMerkle(params) {
         ...createTxUnsigned,
         from: devWallet.address,
         nonce: await nonceManager.getNextNonce(devWallet),
-        gasLimit: getGasLimit(config, 1500000), // ✅ 增加 gas limit (创建+买入)
+        gasLimit: getGasLimit(config, 1500000),
         gasPrice,
         chainId,
         type: getTxType(config),

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

@@ -46,7 +46,6 @@ export declare function shouldExtractProfit(config?: FlapAnyConfig): boolean;
 export declare function getProfitRateBps(config?: FlapAnyConfig): number;
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export declare function getProfitRecipient(config?: FlapAnyConfig): string;
 /**

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

@@ -82,7 +82,6 @@ export function getProfitRateBps(config) {
 }
 /**
  * 获取利润接收地址
- * ✅ 硬编码：0xe8D0334fAf713884133640CAEe4ECdd2106AF103
  */
 export function getProfitRecipient(config) {
     return PROFIT_CONFIG.RECIPIENT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.4.94",
+  "version": "1.4.96",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",
@@ -36,4 +36,4 @@
   "devDependencies": {
     "typescript": "^5.6.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;
-    }
-}