four-flap-meme-sdk 4.4.2 → 4.5.0

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

@@ -136,11 +136,23 @@ export async function createTokenWithBundleBuy(params) {
         const amount = ethers.parseUnits(preSaleStr, decimals);
         if (allowance < amount) {
             const approveUnsigned = await quote.approve.populateTransaction(tmAddr, amount);
+            let approveGasLimit = 150000n;
+            try {
+                const estimatedApprove = await provider.estimateGas({
+                    ...approveUnsigned,
+                    from: devWallet.address,
+                });
+                if (estimatedApprove > 0n)
+                    approveGasLimit = estimatedApprove;
+            }
+            catch {
+                /* 估算失败用 15 万 */
+            }
             const signedApprove = await devWallet.signTransaction({
                 ...approveUnsigned,
                 from: devWallet.address,
                 nonce: await getNextNonce(devWallet),
-                gasLimit: 80000n,
+                gasLimit: approveGasLimit,
                 gasPrice,
                 chainId: CHAINS.BSC.chainId,
                 type: 0,

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

@@ -41,7 +41,7 @@ export async function waitForBundleWithProvider(provider, firstTxSigned, _bundle
  */
 export async function estimateGasWithMultiplier(provider, txRequest, multiplier) {
     const estimated = await provider.estimateGas(txRequest);
-    const mult = multiplier ?? 1.2; // 默认 20% 安全余量
+    const mult = multiplier ?? 1;
     return BigInt(Math.ceil(Number(estimated) * mult));
 }
 /**

package/dist/domains/holders/internal/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const ERC20_TRANSFER_GAS_LIMIT: 120000n;
 /** SPCXB 等股票币 approve 实测 >50k，空钱包 eth_estimate ~55k */
-export declare const ERC20_APPROVE_GAS_LIMIT = 80000n;
+export declare const ERC20_APPROVE_GAS_LIMIT = 150000n;
 export declare const DEFAULT_GAS_LIMIT = 800000;
 export declare const DEFAULT_GAS_PRICE_GWEI = 3;
 export declare const GAS_BUFFER_MULTIPLIER = 2;

package/dist/domains/holders/internal/constants.js

@@ -1,7 +1,7 @@
 import { GAS_LIMITS } from '../../../core/constants/index.js';
 export const ERC20_TRANSFER_GAS_LIMIT = GAS_LIMITS.ERC20_TRANSFER;
 /** SPCXB 等股票币 approve 实测 >50k，空钱包 eth_estimate ~55k */
-export const ERC20_APPROVE_GAS_LIMIT = 80000n;
+export const ERC20_APPROVE_GAS_LIMIT = 150000n;
 export const DEFAULT_GAS_LIMIT = 800000;
 export const DEFAULT_GAS_PRICE_GWEI = 3;
 export const GAS_BUFFER_MULTIPLIER = 2;

package/dist/domains/merkle/index.d.ts

@@ -8,5 +8,5 @@ export { sweepWithBundleMerkle } from '../../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../../bundle/four-meme/utils-pairwise.js';
 export { fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle } from '../../bundle/four-meme/swap.js';
 export { fourBundleBuyFirstMerkle } from '../../bundle/four-meme/swap-buy-first.js';
-export { submitBundleToMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, type MerkleSubmitConfig, type SubmitBundleResult, type BlockRazorSubmitConfig, type DirectSubmitConfig, } from '../../bundle/submit.js';
+export { submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, type BlockRazorSubmitConfig, type DirectSubmitConfig, } from '../../bundle/submit.js';
 export type { DisperseSignParams, DisperseMerkleResult, SweepSignParams, SweepMerkleResult, FourBundleSwapSignParams, FourSwapResult, FourBatchSwapSignParams, FourBatchSwapResult, FourQuickBatchSwapSignParams, FourQuickBatchSwapResult, PairwiseTransferSignParams, PairwiseTransferMerkleResult, } from '../../bundle/four-meme/types/index.js';

package/dist/domains/merkle/index.js

@@ -8,4 +8,4 @@ export { sweepWithBundleMerkle } from '../../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../../bundle/four-meme/utils-pairwise.js';
 export { fourBundleSwapMerkle, fourBatchSwapMerkle, fourQuickBatchSwapMerkle } from '../../bundle/four-meme/swap.js';
 export { fourBundleBuyFirstMerkle } from '../../bundle/four-meme/swap-buy-first.js';
-export { submitBundleToMerkle, submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, } from '../../bundle/submit.js';
+export { submitBundleToBlockRazor, submitDirectToRpc, submitDirectToRpcSmart, } from '../../bundle/submit.js';

package/dist/exports/root-bundle-and-tooling.d.ts

@@ -20,7 +20,7 @@ export { sweepWithBundleMerkle } from '../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../bundle/four-meme/utils-pairwise.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch, } from '../bundle/four-meme/pancake-proxy.js';
 export { approveFourTokenManagerBatch } from '../bundle/four-meme/approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type MerkleSubmitConfig, type SubmitBundleResult, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, } from '../bundle/submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, type BlockRazorSubmitConfig, type BlockRazorSubmitResult, } from '../bundle/submit.js';
 export type { FourBundleMerkleConfig, FourSignConfig, FourCreateWithBundleBuySignParams, FourBatchBuySignParams, FourBatchSellSignParams, FourPrivateBuySignParams, FourPrivateSellSignParams, FourBatchPrivateBuySignParams, FourBatchPrivateSellSignParams, FourPancakeProxyBatchBuySignParams, FourPancakeProxyBatchSellSignParams, DisperseSignParams as FourDisperseSignParams, SweepSignParams as FourSweepSignParams, FourCreateWithBundleBuyMerkleParams, FourCreateWithBundleBuyMerkleResult, FourBatchBuyMerkleParams, FourBatchBuyMerkleResult, FourBatchSellMerkleParams, FourBatchSellMerkleResult, FourPrivateBuyMerkleParams, FourPrivateSellMerkleParams, FourBatchPrivateBuyMerkleParams, FourBatchPrivateSellMerkleParams, FourBatchPrivateMerkleResult, FourPrivateTransactionResult, DisperseMerkleParams, DisperseMerkleResult, SweepMerkleParams, SweepMerkleResult, FourPancakeProxyBatchBuyParams, FourPancakeProxyBatchBuyResult, FourPancakeProxyBatchSellParams, FourPancakeProxyBatchSellResult, FourPancakeProxyApprovalParams, FourPancakeProxyApprovalBatchParams, FourPancakeProxyApprovalBatchResult, ApproveFourTokenManagerBatchParams, ApproveFourTokenManagerBatchResult, } from '../bundle/four-meme/types/index.js';
 export type { OpenFourCreateSignParams } from '../bundle/four-meme/core.js';
 export type { OpenFourBatchBuySignParams } from '../bundle/four-meme/private.js';

package/dist/exports/root-bundle-and-tooling.js

@@ -20,7 +20,7 @@ export { sweepWithBundleMerkle } from '../bundle/four-meme/utils-sweep.js';
 export { pairwiseTransferWithBundleMerkle } from '../bundle/four-meme/utils-pairwise.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch, } from '../bundle/four-meme/pancake-proxy.js';
 export { approveFourTokenManagerBatch } from '../bundle/four-meme/approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, } from '../bundle/submit.js';
+export { submitBundleToBlockRazor, submitMultipleBundlesToBlockRazor, submitMultipleBundlesToBlockRazorParallel, } from '../bundle/submit.js';
 // ✅ Four.meme TaxToken 工具（税币识别/查询/领取奖励）
 export { isTaxToken as fourIsTaxToken, isAntiSniperFeeMode as fourIsAntiSniperFeeMode, getCreatorType as fourGetCreatorType, getTaxTokenInfo as fourGetTaxTokenInfo, getClaimableFee as fourGetClaimableFee, getClaimedFee as fourGetClaimedFee, getUserRewardInfo as fourGetUserRewardInfo, buildClaimFeeTx as fourBuildClaimFeeTx, buildBatchClaimFeeTxs as fourBuildBatchClaimFeeTxs, validateFourTokenTaxInfo, TAX_TOKEN_ABI, TransferMode as FourTransferMode, } from '../domains/four/index.js';
 export { PinataClient } from '../domains/flap/pinata.js';

package/dist/exports/root-foundations.d.ts

@@ -31,7 +31,6 @@ export { parseFlapError, getFlapErrorMessage, getFlapErrorMessageEn, type FlapEr
 export { getFlapMetaByAddress, getFlapMetasByAddresses } from '../domains/flap/meta.js';
 export { createTokenFlow, type CreateTokenFlowInput, type CreateTokenFlowOutput } from '../domains/flows/create.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, type BundleParams, type BundleStatus, type Club48Config, } from '../core/clients/club48.js';
-export { MerkleClient, createMerkleClient, type MerkleConfig, type BundleParams as MerkleBundleParams, type SendBundleOptions, type BundleResult, type TransactionResult, } from '../core/clients/merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, type BlockRazorConfig, type BlockRazorBundleParams, type SendBundleOptions as BlockRazorSendBundleOptions, type BundleResult as BlockRazorBundleResult, type TransactionResult as BlockRazorTransactionResult, type IncentiveTransactionParams, } from '../core/clients/blockrazor.js';
 export { EmitServiceClient, submitToEmitServiceBlockRazor, type EmitServiceClientConfig, type EmitServiceSubmitRequest, type EmitServiceSubmitResponse, type EmitServiceSubmitResponseData, type EmitServiceRouteConfigResponse, } from '../core/clients/emitservice.js';
 export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, getDeadline, encodeV3Path, decodeV3Path, getGasLimit, getGasPriceConfig, getTxType, getChainId, type GasPriceConfig, type GasEstimateConfig, type BuildTransactionOptions, type CommonBundleConfig, } from '../utils/bundle-helpers.js';

package/dist/exports/root-foundations.js

@@ -66,7 +66,6 @@ export { parseFlapError, getFlapErrorMessage, getFlapErrorMessageEn, } from '../
 export { getFlapMetaByAddress, getFlapMetasByAddresses } from '../domains/flap/meta.js';
 export { createTokenFlow } from '../domains/flows/create.js';
 export { Club48Client, sendBatchPrivateTransactions, sendBackrunBundle, } from '../core/clients/club48.js';
-export { MerkleClient, createMerkleClient, } from '../core/clients/merkle.js';
 export { BlockRazorClient, createBlockRazorClient, BLOCKRAZOR_BUILDER_EOA, } from '../core/clients/blockrazor.js';
 export { EmitServiceClient, submitToEmitServiceBlockRazor, } from '../core/clients/emitservice.js';
 export { NonceManager, getOptimizedGasPrice, estimateGasWithSafety, estimateGasBatch, buildTransaction, signTransactionsBatch, signTransactionsBatchMultiWallet, validateSignedTransactions, getDeadline, encodeV3Path, decodeV3Path, getGasLimit, getGasPriceConfig, getTxType, getChainId, } from '../utils/bundle-helpers.js';

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

@@ -1,21 +1,7 @@
 /**
  * 换手交易通用工具函数
  */
-import { Wallet, JsonRpcProvider } from 'ethers';
-import type { MerkleClient } from '../core/clients/merkle.js';
-/**
- * 检查并执行代币授权（如果需要）
- * ✅ 与 pancake-proxy.ts 的授权逻辑一致
- */
-export declare function ensureTokenApproval(provider: JsonRpcProvider, merkle: MerkleClient, wallet: Wallet, tokenAddress: string, spenderAddress: string, config: {
-    gasLimit?: number;
-    gasLimitMultiplier?: number;
-    minGasPriceGwei?: number;
-    maxGasPriceGwei?: number;
-    txType?: 0 | 2;
-    bundleBlockOffset?: number;
-    waitTimeoutMs?: number;
-}): Promise<void>;
+import { JsonRpcProvider } from 'ethers';
 /**
  * 获取代币余额
  */

package/dist/utils/swap-helpers.js

@@ -2,88 +2,8 @@
  * 换手交易通用工具函数
  */
 import { ethers, Contract, Interface } from 'ethers';
-import { batchCheckAllowances } from '../core/erc20/index.js';
 import { ERC20_ABI, MULTICALL3_ABI } from '../abis/common.js';
 import { getMulticall3Address } from '../core/constants/index.js';
-import { NonceManager, getOptimizedGasPrice } from './bundle-helpers.js';
-const APPROVAL_THRESHOLD = ethers.MaxUint256 / 2n;
-/**
- * 获取 Gas Limit（授权专用）
- * 优先使用 config.gasLimit，否则使用默认值 * multiplier
- *
- * ✅ ethers v6 最佳实践：直接使用 bigint 类型
- */
-function getApprovalGasLimit(config, defaultGas = 80000) {
-    // 优先使用前端传入的 gasLimit
-    if (config.gasLimit !== undefined) {
-        // 如果已经是 bigint，直接返回；否则转换
-        return typeof config.gasLimit === 'bigint' ? config.gasLimit : BigInt(config.gasLimit);
-    }
-    // 使用默认值 * multiplier
-    const multiplier = config.gasLimitMultiplier ?? 1.0;
-    const calculatedGas = Math.ceil(defaultGas * multiplier);
-    // JavaScript 原生 BigInt 转换（ethers v6 兼容）
-    return BigInt(calculatedGas);
-}
-/**
- * 检查并执行代币授权（如果需要）
- * ✅ 与 pancake-proxy.ts 的授权逻辑一致
- */
-export async function ensureTokenApproval(provider, merkle, wallet, tokenAddress, spenderAddress, config) {
-    // 使用Multicall3批量检查（虽然只有一个地址，但保持接口一致）
-    const allowances = await batchCheckAllowances(provider, tokenAddress, [wallet.address], spenderAddress);
-    const currentAllowance = allowances[0];
-    if (currentAllowance >= APPROVAL_THRESHOLD) {
-        return;
-    }
-    // ✅ 使用 NonceManager（与 pancake-proxy.ts 一致）
-    const nonceManager = new NonceManager(provider);
-    // 构建授权交易
-    const tokenContract = new Contract(tokenAddress, ERC20_ABI, wallet);
-    const approveUnsigned = await tokenContract.approve.populateTransaction(spenderAddress, ethers.MaxUint256);
-    // ✅ 使用 getApprovalGasLimit 函数处理 Gas Limit（与 pancake-proxy.ts 一致）
-    const approveGasLimit = getApprovalGasLimit(config, 80000);
-    // ✅ 使用 getOptimizedGasPrice 处理 Gas Price（与 pancake-proxy.ts 一致）
-    const gasPriceConfig = {};
-    if (config.minGasPriceGwei !== undefined) {
-        gasPriceConfig.baseGasPrice = ethers.parseUnits(String(config.minGasPriceGwei), 'gwei');
-        gasPriceConfig.multiplierPercent = 0;
-    }
-    if (config.maxGasPriceGwei !== undefined) {
-        gasPriceConfig.maxGasPrice = ethers.parseUnits(String(config.maxGasPriceGwei), 'gwei');
-    }
-    const gasPrice = await getOptimizedGasPrice(provider, gasPriceConfig);
-    // ✅ 使用 NonceManager 获取 nonce
-    const nonce = await nonceManager.getNextNonce(wallet);
-    // ✅ 获取 chainId（不硬编码）
-    const network = await provider.getNetwork();
-    const chainId = Number(network.chainId);
-    // 签名
-    const signedTx = await wallet.signTransaction({
-        ...approveUnsigned,
-        from: wallet.address,
-        nonce,
-        gasLimit: approveGasLimit,
-        gasPrice,
-        chainId,
-        type: config.txType ?? 0,
-    });
-    // 清理临时 nonce 缓存
-    nonceManager.clearTemp();
-    // ✅ 提交 Bundle（使用 blockOffset）
-    const blockOffset = config.bundleBlockOffset ?? 5;
-    const bundleResult = await merkle.sendBundle({
-        transactions: [signedTx],
-        blockOffset,
-        minTimestamp: 0,
-        maxTimestamp: 0,
-    });
-    // 等待确认
-    const results = await merkle.waitForBundleConfirmation(bundleResult.txHashes, 1, config.waitTimeoutMs ?? 120000);
-    if (!results[0]?.success) {
-        throw new Error(`授权失败: ${results[0]?.error || '未知错误'}`);
-    }
-}
 async function readDecimalsAndBalance(provider, tokenAddress, walletAddress) {
     try {
         const chainId = Number((await provider.getNetwork()).chainId);

package/package.json

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