four-flap-meme-sdk 2.2.19 → 3.0.0

package/dist/{contracts → domains/four/contracts}/helper3.js

@@ -1,7 +1,10 @@
 import { Contract, JsonRpcProvider, Wallet } from 'ethers';
-import Helper3Abi from '../shared/abis/TokenManagerHelper3.json' with { type: 'json' };
-import { ADDRESSES } from '../utils/constants.js';
+import Helper3Abi from '../../../abis/contracts/TokenManagerHelper3.json' with { type: 'json' };
+import { ADDRESSES } from '../../../core/constants/index.js';
+const HELPER3_ABI = Helper3Abi;
 export class Helper3 {
+    address;
+    provider;
     constructor(address, provider) {
         this.address = address;
         this.provider = provider;
@@ -15,25 +18,56 @@ export class Helper3 {
         return new Helper3(addresses[chain], new JsonRpcProvider(rpcUrl));
     }
     get contract() {
-        return new Contract(this.address, Helper3Abi, this.provider);
-    }
-    async getTokenInfo(token) { return await this.contract.getTokenInfo(token); }
-    async tryBuy(token, amount, funds) { return await this.contract.tryBuy(token, amount, funds); }
-    async trySell(token, amount) { return await this.contract.trySell(token, amount); }
-    async calcInitialPrice(maxRaising, totalSupply, offers, reserves) { return await this.contract.calcInitialPrice(maxRaising, totalSupply, offers, reserves); }
-    async calcBuyAmount(ti, funds) { return await this.contract.calcBuyAmount(ti, funds); }
-    async calcBuyCost(ti, amount) { return await this.contract.calcBuyCost(ti, amount); }
-    async calcSellCost(ti, amount) { return await this.contract.calcSellCost(ti, amount); }
-    async calcTradingFee(ti, funds) { return await this.contract.calcTradingFee(ti, funds); }
-    async getPancakePair(token) { return await this.contract.getPancakePair(token); }
-    async WETH() { return await this.contract.WETH(); }
-    async WHITE_LIST() { return await this.contract.WHITE_LIST(); }
-    async calcEthIn(token, amount) { return await this.contract.calcEthIn(token, amount); }
-    async calcEthOut(token, amount) { return await this.contract.calcEthOut(token, amount); }
-    async calcTokenIn(token, amountEth) { return await this.contract.calcTokenIn(token, amountEth); }
-    async calcTokenOut(token, amountEth) { return await this.contract.calcTokenOut(token, amountEth); }
+        return new Contract(this.address, HELPER3_ABI, this.provider);
+    }
+    async getTokenInfo(token) {
+        return await this.contract.getTokenInfo(token);
+    }
+    async tryBuy(token, amount, funds) {
+        return await this.contract.tryBuy(token, amount, funds);
+    }
+    async trySell(token, amount) {
+        return await this.contract.trySell(token, amount);
+    }
+    async calcInitialPrice(maxRaising, totalSupply, offers, reserves) {
+        return await this.contract.calcInitialPrice(maxRaising, totalSupply, offers, reserves);
+    }
+    async calcBuyAmount(ti, funds) {
+        return await this.contract.calcBuyAmount(ti, funds);
+    }
+    async calcBuyCost(ti, amount) {
+        return await this.contract.calcBuyCost(ti, amount);
+    }
+    async calcSellCost(ti, amount) {
+        return await this.contract.calcSellCost(ti, amount);
+    }
+    async calcTradingFee(ti, funds) {
+        return await this.contract.calcTradingFee(ti, funds);
+    }
+    async getPancakePair(token) {
+        return await this.contract.getPancakePair(token);
+    }
+    async WETH() {
+        return await this.contract.WETH();
+    }
+    async WHITE_LIST() {
+        return await this.contract.WHITE_LIST();
+    }
+    async calcEthIn(token, amount) {
+        return await this.contract.calcEthIn(token, amount);
+    }
+    async calcEthOut(token, amount) {
+        return await this.contract.calcEthOut(token, amount);
+    }
+    async calcTokenIn(token, amountEth) {
+        return await this.contract.calcTokenIn(token, amountEth);
+    }
+    async calcTokenOut(token, amountEth) {
+        return await this.contract.calcTokenOut(token, amountEth);
+    }
 }
 export class Helper3Writer extends Helper3 {
+    signer;
     constructor(address, signer) {
         super(address, signer.provider);
         this.signer = signer;
@@ -48,7 +82,9 @@ export class Helper3Writer extends Helper3 {
         const signer = new Wallet(privateKey, provider);
         return new Helper3Writer(addresses[chain], signer);
     }
-    get writeContract() { return new Contract(this.address, Helper3Abi, this.signer); }
+    get writeContract() {
+        return new Contract(this.address, HELPER3_ABI, this.signer);
+    }
     async buyWithEth(origin, token, to, funds, minAmount) {
         const tx = await this.writeContract.buyWithEth(origin, token, to, funds, minAmount, { value: funds });
         return await tx.wait();

package/dist/domains/four/contracts/tm-bundle-helpers.d.ts

@@ -0,0 +1,88 @@
+import { JsonRpcProvider } from 'ethers';
+import type { TransactionRequest } from 'ethers';
+import type { SoulPointSignatureMode, VNormalizationMode } from '../../../core/clients/club48.js';
+import { BundleStatus } from '../../../core/clients/club48.js';
+import type { GeneratedWallet } from '../../../utils/wallet.js';
+/**
+ * four.meme Bundle 交易方法
+ * 使用 48.club Bundle 服务实现原子化交易
+ */
+export { BUNDLE_ERRORS as ERRORS, getBundleErrorMessage as getErrorMessage } from '../../../bundle/errors.js';
+export type FourBundleConfig = {
+    rpcUrl: string;
+    fourApiUrl?: string;
+    club48Endpoint?: string;
+    club48ExplorerEndpoint?: string;
+    spMode?: SoulPointSignatureMode;
+    spVMode?: VNormalizationMode;
+    spPrivateKey?: string;
+    bundleBlockOffset?: number;
+    noMerge?: boolean;
+    tipAmountWei?: bigint;
+    txType?: 0 | 2;
+    gasLimitMultiplier?: number;
+    customSubmitFn?: (signedTxs: string[]) => Promise<string>;
+};
+/**
+ * 等待交易上链（不使用 club48 客户端）
+ */
+export type FourProviderBundleWaitStatus = {
+    status: 'INCLUDED';
+    includedBlock?: number;
+} | {
+    status: 'FAILED';
+} | {
+    status: 'PENDING';
+};
+export declare function waitForBundleWithProvider(provider: JsonRpcProvider, firstTxSigned: string, _bundleUuid: string): Promise<FourProviderBundleWaitStatus>;
+/**
+ * 估算 gas 并应用用户配置的倍数
+ */
+export declare function estimateGasWithMultiplier(provider: JsonRpcProvider, txRequest: TransactionRequest, multiplier?: number): Promise<bigint>;
+/**
+ * 获取交易类型（用户可配置）
+ */
+export declare function getTxType(config: FourBundleConfig): 0 | 2;
+/**
+ * 构建完整的交易请求（包含 gas 估算和交易类型）
+ */
+export declare function buildTxRequest(provider: JsonRpcProvider, unsigned: TransactionRequest, from: string, nonce: number, gasPrice: bigint, config: FourBundleConfig, value?: bigint): Promise<TransactionRequest & {
+    gasLimit: bigint;
+    chainId: number;
+    type: 0 | 2;
+}>;
+export type FourCreateWithBundleBuyParams = {
+    privateKeys: string[];
+    buyAmounts: string[];
+    b0Amount?: string;
+    tokenInfo: {
+        name: string;
+        symbol: string;
+        description: string;
+        imageUrl?: string;
+        imageFile?: Blob;
+        label?: 'Meme' | 'AI' | 'Defi' | 'Games' | 'Infra' | 'De-Sci' | 'Social' | 'Depin' | 'Charity' | 'Others';
+        preSale?: string;
+        webUrl?: string;
+        twitterUrl?: string;
+        telegramUrl?: string;
+    };
+    config: FourBundleConfig;
+};
+export type FourCreateWithBundleBuyResult = {
+    bundleUuid: string;
+    tokenAddress?: string;
+    status: BundleStatus | FourProviderBundleWaitStatus;
+    createTx: string;
+    buyTxs: string[];
+    profitTxs: string[];
+    profitHopWallets?: GeneratedWallet[];
+};
+/**
+ * four.meme: 创建代币 + 捆绑购买
+ *
+ * 用户只需传入：
+ * - dev 私钥 + N 个买家私钥
+ * - 对应的购买金额
+ * - 代币基本信息
+ */

package/dist/domains/four/contracts/tm-bundle-helpers.js

@@ -0,0 +1,73 @@
+import { ethers } from 'ethers';
+import { CHAINS } from '../../../core/constants/index.js';
+/**
+ * four.meme Bundle 交易方法
+ * 使用 48.club Bundle 服务实现原子化交易
+ */
+// 错误信息国际化（实现见 bundle/errors）
+export { BUNDLE_ERRORS as ERRORS, getBundleErrorMessage as getErrorMessage } from '../../../bundle/errors.js';
+export async function waitForBundleWithProvider(provider, firstTxSigned, _bundleUuid) {
+    const maxAttempts = 60; // 最多等待 60 秒
+    for (let i = 0; i < maxAttempts; i++) {
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+        try {
+            const txHash = ethers.Transaction.from(firstTxSigned).hash;
+            if (!txHash)
+                continue;
+            const receipt = await provider.getTransactionReceipt(txHash);
+            if (receipt) {
+                if (receipt.status === 1) {
+                    return { status: 'INCLUDED', includedBlock: receipt.blockNumber };
+                }
+                else {
+                    return { status: 'FAILED' };
+                }
+            }
+        }
+        catch (_error) {
+            // 继续等待
+        }
+    }
+    return { status: 'PENDING' };
+}
+// ========================================
+// 辅助函数：估算 gas 并应用配置
+// ========================================
+/**
+ * 估算 gas 并应用用户配置的倍数
+ */
+export async function estimateGasWithMultiplier(provider, txRequest, multiplier) {
+    const estimated = await provider.estimateGas(txRequest);
+    const mult = multiplier ?? 1.2; // 默认 20% 安全余量
+    return BigInt(Math.ceil(Number(estimated) * mult));
+}
+/**
+ * 获取交易类型（用户可配置）
+ */
+export function getTxType(config) {
+    return config.txType ?? 0; // 默认 Legacy (type 0)，适用于 48.club/BSC
+}
+/**
+ * 构建完整的交易请求（包含 gas 估算和交易类型）
+ */
+export async function buildTxRequest(provider, unsigned, from, nonce, gasPrice, config, value) {
+    const gasLimit = await estimateGasWithMultiplier(provider, { ...unsigned, from, value }, config.gasLimitMultiplier);
+    const txType = getTxType(config);
+    return {
+        ...unsigned,
+        from,
+        nonce,
+        gasLimit,
+        gasPrice,
+        chainId: CHAINS.BSC.chainId,
+        type: txType,
+    };
+}
+/**
+ * four.meme: 创建代币 + 捆绑购买
+ *
+ * 用户只需传入：
+ * - dev 私钥 + N 个买家私钥
+ * - 对应的购买金额
+ * - 代币基本信息
+ */

package/dist/{contracts → domains/four/contracts}/tm-bundle.d.ts

@@ -1,55 +1,7 @@
-import { BundleStatus, SoulPointSignatureMode, VNormalizationMode } from '../shared/clients/club48.js';
-import type { GeneratedWallet } from '../utils/wallet.js';
-export type FourBundleConfig = {
-    rpcUrl: string;
-    fourApiUrl?: string;
-    club48Endpoint?: string;
-    club48ExplorerEndpoint?: string;
-    spMode?: SoulPointSignatureMode;
-    spVMode?: VNormalizationMode;
-    spPrivateKey?: string;
-    bundleBlockOffset?: number;
-    noMerge?: boolean;
-    tipAmountWei?: bigint;
-    txType?: 0 | 2;
-    gasLimitMultiplier?: number;
-    customSubmitFn?: (signedTxs: string[]) => Promise<string>;
-};
-export type FourCreateWithBundleBuyParams = {
-    privateKeys: string[];
-    buyAmounts: string[];
-    b0Amount?: string;
-    tokenInfo: {
-        name: string;
-        symbol: string;
-        description: string;
-        imageUrl?: string;
-        imageFile?: Blob;
-        label?: 'Meme' | 'AI' | 'Defi' | 'Games' | 'Infra' | 'De-Sci' | 'Social' | 'Depin' | 'Charity' | 'Others';
-        preSale?: string;
-        webUrl?: string;
-        twitterUrl?: string;
-        telegramUrl?: string;
-    };
-    config: FourBundleConfig;
-};
-export type FourCreateWithBundleBuyResult = {
-    bundleUuid: string;
-    tokenAddress?: string;
-    status: BundleStatus;
-    createTx: string;
-    buyTxs: string[];
-    profitTxs: string[];
-    profitHopWallets?: GeneratedWallet[];
-};
-/**
- * four.meme: 创建代币 + 捆绑购买
- *
- * 用户只需传入：
- * - dev 私钥 + N 个买家私钥
- * - 对应的购买金额
- * - 代币基本信息
- */
+import { BundleStatus } from '../../../core/clients/club48.js';
+import type { GeneratedWallet } from '../../../utils/wallet.js';
+import { FourBundleConfig, FourCreateWithBundleBuyParams, FourCreateWithBundleBuyResult } from './tm-bundle-helpers.js';
+export type { FourBundleConfig, FourCreateWithBundleBuyParams, FourCreateWithBundleBuyResult, FourProviderBundleWaitStatus, } from './tm-bundle-helpers.js';
 export declare function createTokenWithBundleBuy(params: FourCreateWithBundleBuyParams): Promise<FourCreateWithBundleBuyResult>;
 export type FourBatchBuyParams = {
     privateKeys: string[];