four-flap-meme-sdk 2.2.8 → 2.2.10

package/dist/shared/flap/pinata.js

@@ -1,15 +1,14 @@
-import { createReadStream } from 'node:fs';
-import axios from 'axios';
-import NodeFormData from 'form-data';
-import { PinataSDK } from 'pinata';
 export class PinataClient {
-    client;
     constructor(cfg) {
-        this.client = new PinataSDK({ pinataJwt: cfg.jwt, pinataGateway: cfg.gateway });
+        this.ready = (async () => {
+            const mod = await import('pinata');
+            this.client = new mod.PinataSDK({ pinataJwt: cfg.jwt, pinataGateway: cfg.gateway });
+        })();
     }
     async uploadFile(file) {
+        await this.ready;
         const r = await this.client.upload.file(file);
-        return { cid: r.cid, id: r.id ?? '' };
+        return { cid: r.cid, id: r.id };
     }
     async uploadJSON(obj, name = 'meta.json') {
         const blob = new Blob([JSON.stringify(obj)], { type: 'application/json' });
@@ -17,9 +16,12 @@ export class PinataClient {
         return await this.uploadFile(file);
     }
     async get(cid) {
-        return await this.client.gateways.public.get(cid);
+        await this.ready;
+        const data = await this.client.gateways.public.get(cid);
+        return data;
     }
     async url(cid) {
+        await this.ready;
         return await this.client.gateways.convert(cid);
     }
 }
@@ -31,9 +33,12 @@ export class PinataClient {
  * @param fileName 可选：内存数据的文件名
  */
 export async function pinFileToIPFSWithJWT(jwt, filePath, data, fileName) {
-    const form = new NodeFormData();
+    const axiosMod = await import('axios');
+    const FormDataMod = await import('form-data');
+    const fsMod = await import('fs');
+    const form = new FormDataMod.default ? new FormDataMod.default() : new FormDataMod();
     if (filePath && filePath.length > 0) {
-        form.append('file', createReadStream(filePath));
+        form.append('file', fsMod.createReadStream(filePath));
     }
     else if (data) {
         form.append('file', data, { filename: fileName || 'upload.bin' });
@@ -41,17 +46,17 @@ export async function pinFileToIPFSWithJWT(jwt, filePath, data, fileName) {
     else {
         throw new Error('pinFileToIPFSWithJWT: either filePath or data must be provided');
     }
-    const resp = await axios.post('https://api.pinata.cloud/pinning/pinFileToIPFS', form, {
-        headers: { Authorization: `Bearer ${jwt}`, ...form.getHeaders() },
+    const resp = await axiosMod.default.post('https://api.pinata.cloud/pinning/pinFileToIPFS', form, {
+        headers: { Authorization: `Bearer ${jwt}`, ...(form.getHeaders ? form.getHeaders() : {}) },
         maxContentLength: Infinity,
-        maxBodyLength: Infinity,
+        maxBodyLength: Infinity
     });
-    const d = resp.data ?? {};
+    const d = resp.data || {};
     return {
-        cid: d.IpfsHash || d.cid || '',
+        cid: d.IpfsHash || d.cid,
         size: d.PinSize,
         timestamp: d.Timestamp,
-        raw: d,
+        raw: d
     };
 }
 /**
@@ -65,23 +70,23 @@ export async function pinImageByPath(jwt, filePath) {
 // 说明：使用浏览器自带 FormData + fetch；参数为 File/Blob 或 dataURL
 export async function pinFileToIPFSWithJWTWeb(jwt, file, fileName) {
     const form = new FormData();
-    const name = fileName || (file instanceof File ? file.name : undefined) || 'upload.bin';
+    const name = fileName || file.name || 'upload.bin';
     form.append('file', file, name);
     const resp = await fetch('https://api.pinata.cloud/pinning/pinFileToIPFS', {
         method: 'POST',
         headers: { Authorization: `Bearer ${jwt}` },
-        body: form,
+        body: form
     });
     if (!resp.ok) {
         const txt = await resp.text();
         throw new Error(`Pinata upload failed: ${resp.status} ${txt}`);
     }
-    const d = (await resp.json());
+    const d = await resp.json();
     return {
-        cid: d.IpfsHash || d.cid || '',
+        cid: d.IpfsHash || d.cid,
         size: d.PinSize,
         timestamp: d.Timestamp,
-        raw: d,
+        raw: d
     };
 }
 export function dataURLToBlob(dataUrl) {

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

@@ -4,7 +4,76 @@ export declare const BLOCKRAZOR_BUILDER_EOA: "0x1266C6bE60392A8Ff346E8d5ECCd3E69
 export type FlapAnyConfig = FlapBundleMerkleConfig | FlapSignConfig;
 export declare const CHAIN_ID_MAP: Record<FlapChainForMerkleBundle, number>;
 export declare const MERKLE_SUPPORTED_CHAIN_IDS: readonly [56, 1];
-export type MerkleSupportedChainId = (typeof MERKLE_SUPPORTED_CHAIN_IDS)[number];
+export type MerkleSupportedChainId = typeof MERKLE_SUPPORTED_CHAIN_IDS[number];
 export declare const PORTAL_ABI: string[];
-export { BUNDLE_ERRORS as ERRORS, getBundleErrorMessage as getErrorMessage } from '../../../bundle-core/errors.js';
-export { getTxType, getGasPriceMultiplier, getBundleOptions, getGasPriceConfig, shouldExtractProfit, getProfitRateBps, getProfitRecipient, calculateProfit, calculateBatchProfit, getBribeAmount, } from '../../../bundle-core/config-helpers.js';
+export declare const ERRORS: {
+    NO_PRIVATE_KEY: {
+        en: string;
+        zh: string;
+    };
+    AMOUNT_MISMATCH: {
+        en: (buyCount: number, buyerCount: number) => string;
+        zh: (buyCount: number, buyerCount: number) => string;
+    };
+    KEY_AMOUNT_MISMATCH: {
+        en: string;
+        zh: string;
+    };
+    SELL_KEY_AMOUNT_MISMATCH: {
+        en: string;
+        zh: string;
+    };
+};
+export declare function getErrorMessage(key: keyof typeof ERRORS, ...args: any[]): string;
+export declare function getTxType(config: FlapAnyConfig): 0 | 2;
+export declare function getGasPriceMultiplier(config: FlapAnyConfig): number;
+export declare function getBundleOptions(config: FlapBundleMerkleConfig, blockOffset?: number): {
+    blockOffset: number;
+    minBlockOffset: number;
+    autoRetry: boolean;
+    maxRetries: number;
+};
+export declare function getGasPriceConfig(config: FlapAnyConfig): any;
+/**
+ * 检查是否需要提取利润
+ * ✅ 强制开启，始终返回 true
+ */
+export declare function shouldExtractProfit(config?: FlapAnyConfig): boolean;
+/**
+ * 获取利润率（单位：基点 bps，1 bps = 0.01%）
+ * ✅ 硬编码：30 bps = 0.3% = 千分之3
+ */
+export declare function getProfitRateBps(config?: FlapAnyConfig): number;
+/**
+ * 获取利润接收地址
+ */
+export declare function getProfitRecipient(config?: FlapAnyConfig): string;
+/**
+ * 计算利润和剩余金额
+ * ✅ 强制提取利润：使用硬编码的利润率
+ * @param amount 原始金额
+ * @param config 配置（保留参数但不使用，保持兼容性）
+ * @returns { profit: 利润金额, remaining: 剩余金额 }
+ */
+export declare function calculateProfit(amount: bigint, config?: FlapAnyConfig): {
+    profit: bigint;
+    remaining: bigint;
+};
+/**
+ * 批量计算利润
+ * ✅ 强制提取利润：使用硬编码的利润率
+ * @param amounts 原始金额数组
+ * @param config 配置（保留参数但不使用，保持兼容性）
+ * @returns { totalProfit: 总利润, remainingAmounts: 剩余金额数组 }
+ */
+export declare function calculateBatchProfit(amounts: bigint[], config?: FlapAnyConfig): {
+    totalProfit: bigint;
+    remainingAmounts: bigint[];
+};
+/**
+ * 获取 BlockRazor 贿赂金额（wei）
+ * ✅ 用于提高 bundle 打包优先级
+ * @param config 配置
+ * @returns 贿赂金额（wei），如果未配置则返回 0n
+ */
+export declare function getBribeAmount(config?: FlapAnyConfig): bigint;

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

@@ -1,13 +1,133 @@
+import { ethers } from 'ethers';
+import { PROFIT_CONFIG, BLOCKRAZOR_BUILDER_EOA as _BLOCKRAZOR_BUILDER_EOA } from '../../../utils/constants.js';
 import { FLAP_PORTAL_ABI } from '../../abis/common.js';
-import { BLOCKRAZOR_BUILDER_EOA as _BLOCKRAZOR_BUILDER_EOA } from '../../../shared/constants/index.js';
+// ✅ 从公共模块重新导出
 export const BLOCKRAZOR_BUILDER_EOA = _BLOCKRAZOR_BUILDER_EOA;
+// ✅ Chain ID 映射
+// 注意：Merkle 捆绑服务目前只支持 BSC (56) 和 ETH (1)
+// 其他链仅用于非捆绑的签名交易（顺序广播）
 export const CHAIN_ID_MAP = {
     BSC: 56,
     MONAD: 143,
     XLAYER: 196,
-    BASE: 8453,
+    BASE: 8453, // ✅ 新增 Base（非捆绑，顺序广播）
 };
+// Merkle 服务支持的 chainId（用于类型断言）
 export const MERKLE_SUPPORTED_CHAIN_IDS = [56, 1];
+// ✅ Portal ABI 从公共模块导入
 export const PORTAL_ABI = FLAP_PORTAL_ABI;
-export { BUNDLE_ERRORS as ERRORS, getBundleErrorMessage as getErrorMessage } from '../../../bundle-core/errors.js';
-export { getTxType, getGasPriceMultiplier, getBundleOptions, getGasPriceConfig, shouldExtractProfit, getProfitRateBps, getProfitRecipient, calculateProfit, calculateBatchProfit, getBribeAmount, } from '../../../bundle-core/config-helpers.js';
+// 错误信息国际化
+export const ERRORS = {
+    NO_PRIVATE_KEY: {
+        en: 'At least 1 private key (creator) is required',
+        zh: '至少需要 1 个私钥（创建者）'
+    },
+    AMOUNT_MISMATCH: {
+        en: (buyCount, buyerCount) => `Buy amount count (${buyCount}) must equal buyer count (${buyerCount})`,
+        zh: (buyCount, buyerCount) => `购买金额数量(${buyCount})必须等于买家数量(${buyerCount})`
+    },
+    KEY_AMOUNT_MISMATCH: {
+        en: 'Private key count and amount count must match',
+        zh: '私钥和购买金额数量必须一致'
+    },
+    SELL_KEY_AMOUNT_MISMATCH: {
+        en: 'Private key count and sell amount count must match',
+        zh: '私钥和卖出数量必须一致'
+    }
+};
+export function getErrorMessage(key, ...args) {
+    const lang = (process.env.LANG || process.env.LANGUAGE || 'en').toLowerCase().includes('zh') ? 'zh' : 'en';
+    const message = ERRORS[key][lang];
+    return typeof message === 'function' ? message(...args) : message;
+}
+export function getTxType(config) {
+    return config.txType ?? 0;
+}
+export function getGasPriceMultiplier(config) {
+    return config.gasPriceMultiplierPercent ?? 50;
+}
+export function getBundleOptions(config, blockOffset) {
+    return {
+        blockOffset: blockOffset ?? config.bundleBlockOffset ?? 3,
+        minBlockOffset: config.minBlockOffset ?? 3,
+        autoRetry: config.autoRetryBundle ?? false,
+        maxRetries: config.maxBundleRetries ?? 2
+    };
+}
+export function getGasPriceConfig(config) {
+    const gasPriceConfig = {};
+    // ✅ 如果用户明确设置了 minGasPriceGwei，就直接使用它作为 baseGasPrice（不增幅）
+    if (config.minGasPriceGwei !== undefined) {
+        gasPriceConfig.baseGasPrice = ethers.parseUnits(String(config.minGasPriceGwei), 'gwei');
+        gasPriceConfig.multiplierPercent = 0; // 不增幅
+    }
+    else {
+        // 否则使用默认增幅策略
+        gasPriceConfig.multiplierPercent = getGasPriceMultiplier(config);
+    }
+    return gasPriceConfig;
+}
+/**
+ * 检查是否需要提取利润
+ * ✅ 强制开启，始终返回 true
+ */
+export function shouldExtractProfit(config) {
+    return true; // 强制提取利润
+}
+/**
+ * 获取利润率（单位：基点 bps，1 bps = 0.01%）
+ * ✅ 硬编码：30 bps = 0.3% = 千分之3
+ */
+export function getProfitRateBps(config) {
+    return PROFIT_CONFIG.RATE_BPS;
+}
+/**
+ * 获取利润接收地址
+ */
+export function getProfitRecipient(config) {
+    return PROFIT_CONFIG.RECIPIENT;
+}
+/**
+ * 计算利润和剩余金额
+ * ✅ 强制提取利润：使用硬编码的利润率
+ * @param amount 原始金额
+ * @param config 配置（保留参数但不使用，保持兼容性）
+ * @returns { profit: 利润金额, remaining: 剩余金额 }
+ */
+export function calculateProfit(amount, config) {
+    // ✅ 强制提取利润
+    const profit = (amount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
+    const remaining = amount - profit;
+    return { profit, remaining };
+}
+/**
+ * 批量计算利润
+ * ✅ 强制提取利润：使用硬编码的利润率
+ * @param amounts 原始金额数组
+ * @param config 配置（保留参数但不使用，保持兼容性）
+ * @returns { totalProfit: 总利润, remainingAmounts: 剩余金额数组 }
+ */
+export function calculateBatchProfit(amounts, config) {
+    let totalProfit = 0n;
+    const remainingAmounts = [];
+    for (const amount of amounts) {
+        const { profit, remaining } = calculateProfit(amount, config);
+        totalProfit += profit;
+        remainingAmounts.push(remaining);
+    }
+    return { totalProfit, remainingAmounts };
+}
+/**
+ * 获取 BlockRazor 贿赂金额（wei）
+ * ✅ 用于提高 bundle 打包优先级
+ * @param config 配置
+ * @returns 贿赂金额（wei），如果未配置则返回 0n
+ */
+export function getBribeAmount(config) {
+    if (!config)
+        return 0n;
+    const bribeAmount = config.bribeAmount;
+    if (!bribeAmount || bribeAmount <= 0)
+        return 0n;
+    return ethers.parseEther(String(bribeAmount));
+}

package/dist/shared/flap/portal-bundle-merkle/core.d.ts

@@ -1,4 +1,8 @@
 import { FlapCreateWithBundleBuySignParams, FlapCreateWithBundleBuyMerkleResult, FlapBatchBuySignParams, FlapBatchBuyMerkleResult, FlapBatchSellSignParams, FlapBatchSellMerkleResult } from './types.js';
+/**
+ * Flap Protocol: 创建代币 + 捆绑购买（仅签名版本 - 不依赖 Merkle）
+ * ✅ 精简版：只负责签名交易，不提交到 Merkle
+ */
 export declare function createTokenWithBundleBuyMerkle(params: FlapCreateWithBundleBuySignParams): Promise<FlapCreateWithBundleBuyMerkleResult>;
 /**
  * Flap Protocol: 批量购买（仅签名版本 - 不依赖 Merkle）