four-flap-meme-sdk 1.2.99 → 1.3.2

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

@@ -9,5 +9,6 @@ export { fourPrivateBuyMerkle, fourPrivateSellMerkle, fourBatchPrivateBuyMerkle,
 export { disperseWithBundleMerkle, sweepWithBundleMerkle } from './utils.js';
 export { fourPancakeProxyBatchBuyMerkle, fourPancakeProxyBatchSellMerkle, approveFourPancakeProxy, approveFourPancakeProxyBatch } from './pancake-proxy.js';
 export { approveFourTokenManagerBatch, type ApproveFourTokenManagerBatchParams, type ApproveFourTokenManagerBatchResult } from './approve-tokenmanager.js';
-export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, type MerkleSubmitConfig, type SubmitBundleResult, submitDirectToRpc, submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './submit.js';
+export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, type MerkleSubmitConfig, type SubmitBundleResult, submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './submit.js';
 export { fourBundleBuyFirstMerkle, type FourBundleBuyFirstSignParams, type FourBuyFirstSignConfig, type FourBuyFirstResult } from './swap-buy-first.js';

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

@@ -18,6 +18,7 @@ export { approveFourTokenManagerBatch } from './approve-tokenmanager.js';
 // Bundle提交方法（服务器端使用）
 export { submitBundleToMerkle, submitMultipleBundles, submitMultipleBundlesParallel, 
 // ✅ Monad 等链的逐笔广播方法
-submitDirectToRpc, submitDirectToRpcParallel } from './submit.js';
+submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+submitDirectToRpcParallel } from './submit.js';
 // 先买后卖换手方法
 export { fourBundleBuyFirstMerkle } from './swap-buy-first.js';

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

@@ -163,6 +163,16 @@ export interface DirectSubmitResult {
  * ```
  */
 export declare function submitDirectToRpc(signedTransactions: string[], config: DirectSubmitConfig): Promise<DirectSubmitResult>;
+/**
+ * ✅ 顺序广播并等待确认（用于多跳交易等需要顺序执行的场景）
+ *
+ * 每笔交易广播后会等待上链确认，确保后续交易能正确执行
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param config 直接广播配置
+ * @returns 广播结果
+ */
+export declare function submitDirectToRpcSequential(signedTransactions: string[], config: DirectSubmitConfig): Promise<DirectSubmitResult>;
 /**
  * 并行逐笔广播到 RPC（速度更快，但可能有 nonce 冲突）
  *

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

@@ -223,6 +223,110 @@ export async function submitDirectToRpc(signedTransactions, config) {
         errorSummary: errors.length > 0 ? errors.join('; ') : undefined
     };
 }
+/**
+ * ✅ 顺序广播并等待确认（用于多跳交易等需要顺序执行的场景）
+ *
+ * 每笔交易广播后会等待上链确认，确保后续交易能正确执行
+ *
+ * @param signedTransactions 签名后的交易数组
+ * @param config 直接广播配置
+ * @returns 广播结果
+ */
+export async function submitDirectToRpcSequential(signedTransactions, config) {
+    const totalTransactions = signedTransactions?.length ?? 0;
+    if (!signedTransactions || signedTransactions.length === 0) {
+        return {
+            code: false,
+            totalTransactions: 0,
+            successCount: 0,
+            failedCount: 0,
+            txHashes: [],
+            results: [],
+            errorSummary: 'signedTransactions cannot be empty'
+        };
+    }
+    if (!config.rpcUrl) {
+        return {
+            code: false,
+            totalTransactions,
+            successCount: 0,
+            failedCount: totalTransactions,
+            txHashes: [],
+            results: [],
+            errorSummary: 'rpcUrl is required in config'
+        };
+    }
+    const chainId = config.chainId ?? 143;
+    const chainName = config.chainName ?? 'MONAD';
+    const confirmationTimeout = config.confirmationTimeout ?? 60000; // 默认60秒超时
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId,
+        name: chainName
+    });
+    const results = [];
+    const txHashes = [];
+    const errors = [];
+    // 顺序广播并等待确认
+    for (let i = 0; i < signedTransactions.length; i++) {
+        const signedTx = signedTransactions[i];
+        try {
+            console.log(`📤 [${chainName}] 广播交易 ${i + 1}/${totalTransactions}...`);
+            // 广播交易
+            const txResponse = await provider.broadcastTransaction(signedTx);
+            console.log(`✅ [${chainName}] 交易 ${i + 1} 已广播: ${txResponse.hash}`);
+            // ✅ 等待交易确认
+            console.log(`⏳ [${chainName}] 等待交易 ${i + 1} 确认...`);
+            const receipt = await provider.waitForTransaction(txResponse.hash, 1, // 等待1个确认
+            confirmationTimeout);
+            if (receipt && receipt.status === 1) {
+                results.push({
+                    index: i,
+                    success: true,
+                    txHash: txResponse.hash
+                });
+                txHashes.push(txResponse.hash);
+                console.log(`✅ [${chainName}] 交易 ${i + 1} 已确认: ${txResponse.hash}`);
+            }
+            else {
+                const errorMsg = `交易执行失败（status=${receipt?.status})`;
+                results.push({
+                    index: i,
+                    success: false,
+                    txHash: txResponse.hash,
+                    error: errorMsg
+                });
+                errors.push(`交易 ${i + 1}: ${errorMsg}`);
+                console.error(`❌ [${chainName}] 交易 ${i + 1} 失败: ${errorMsg}`);
+                // ✅ 多跳场景：如果某笔失败，后续交易可能也会失败，继续尝试但标记
+                console.warn(`⚠️ [${chainName}] 交易 ${i + 1} 失败，继续尝试后续交易...`);
+            }
+        }
+        catch (error) {
+            const errorMessage = error?.message || String(error);
+            results.push({
+                index: i,
+                success: false,
+                error: errorMessage
+            });
+            errors.push(`交易 ${i + 1}: ${errorMessage}`);
+            console.error(`❌ [${chainName}] 交易 ${i + 1}/${totalTransactions} 失败:`, errorMessage);
+            // ✅ 多跳场景：如果某笔失败，后续交易可能也会失败，继续尝试
+            console.warn(`⚠️ [${chainName}] 继续尝试后续交易...`);
+        }
+    }
+    const successCount = txHashes.length;
+    const failedCount = totalTransactions - successCount;
+    console.log(`📊 [${chainName}] 顺序广播完成: ${successCount}/${totalTransactions} 成功`);
+    return {
+        code: successCount > 0,
+        totalTransactions,
+        successCount,
+        failedCount,
+        txHashes,
+        results,
+        errorSummary: errors.length > 0 ? errors.join('; ') : undefined
+    };
+}
 /**
  * 并行逐笔广播到 RPC（速度更快，但可能有 nonce 冲突）
  *

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

@@ -86,8 +86,20 @@ export async function createTokenWithBundleBuyMerkle(params) {
     const extractProfit = shouldExtractProfit(config);
     const { fundsList, originalAmounts, totalBuyAmount, totalProfit } = analyzeBuyFunds(buyAmounts, config, extractProfit);
     const maxFundsIndex = findMaxIndex(originalAmounts);
-    const unsignedBuys = await populateBuyTransactions(buyers, portalAddr, tokenAddress, fundsList);
     const gasLimits = buildGasLimitList(buyers.length, config);
+    // ✅ 支持 quoteToken：如果传入了 quoteToken 且非零地址，则使用它
+    const inputToken = params.quoteToken && params.quoteToken !== ZERO_ADDRESS ? params.quoteToken : ZERO_ADDRESS;
+    const useNativeToken = inputToken === ZERO_ADDRESS;
+    // ✅ 如果使用非原生代币（如 USDC），需要根据精度转换金额
+    let adjustedFundsList = fundsList;
+    if (!useNativeToken && params.quoteTokenDecimals !== undefined && params.quoteTokenDecimals !== 18) {
+        const decimalsDiff = 18 - params.quoteTokenDecimals;
+        const divisor = BigInt(10 ** decimalsDiff);
+        adjustedFundsList = fundsList.map(amount => amount / divisor);
+        console.log('🔍 createToken SDK 精度转换: 18 -> ', params.quoteTokenDecimals, ', 原始:', fundsList, ', 转换后:', adjustedFundsList);
+    }
+    console.log('🔍 createToken SDK - quoteToken:', params.quoteToken, 'inputToken:', inputToken, 'useNativeToken:', useNativeToken);
+    const unsignedBuys = await populateBuyTransactionsWithQuote(buyers, portalAddr, tokenAddress, adjustedFundsList, inputToken, useNativeToken);
     const buyerNonces = await allocateBuyerNonces(buyers, extractProfit, maxFundsIndex, totalProfit, nonceManager);
     const signedBuys = await signBuyTransactions({
         unsignedBuys,
@@ -97,7 +109,8 @@ export async function createTokenWithBundleBuyMerkle(params) {
         gasPrice,
         chainId,
         config,
-        fundsList
+        fundsList: adjustedFundsList, // ✅ 使用调整后的金额
+        useNativeToken // ✅ 传递是否使用原生代币
     });
     signedTxs.push(...signedBuys);
     await appendProfitTransaction({
@@ -344,7 +357,8 @@ async function allocateBuyerNonces(buyers, extractProfit, maxIndex, totalProfit,
     }
     return nonces;
 }
-async function signBuyTransactions({ unsignedBuys, buyers, nonces, gasLimits, gasPrice, chainId, config, fundsList }) {
+async function signBuyTransactions({ unsignedBuys, buyers, nonces, gasLimits, gasPrice, chainId, config, fundsList, useNativeToken = true // ✅ 默认使用原生代币
+ }) {
     return await Promise.all(unsignedBuys.map((unsigned, i) => buyers[i].signTransaction({
         ...unsigned,
         from: buyers[i].address,
@@ -353,7 +367,7 @@ async function signBuyTransactions({ unsignedBuys, buyers, nonces, gasLimits, ga
         gasPrice,
         chainId,
         type: getTxType(config),
-        value: fundsList[i]
+        value: useNativeToken ? fundsList[i] : 0n // ✅ 非原生代币时 value 为 0
     })));
 }
 async function appendProfitTransaction({ extractProfit, totalProfit, buyers, maxIndex, nonces, gasPrice, chainId, config, signedTxs }) {

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

@@ -89,6 +89,8 @@ export type FlapCreateWithBundleBuySignParams = {
         meta: string;
     };
     quoteToken?: string;
+    /** ✅ 报价代币精度（如 USDC 为 6），不传默认 18 */
+    quoteTokenDecimals?: number;
     tokenAddress: string;
     minOutputAmounts?: (string | bigint)[];
     config: FlapSignConfig;

package/dist/index.d.ts

@@ -42,4 +42,5 @@ export { fourBundleBuyFirstMerkle, type FourBuyFirstConfig, type FourBundleBuyFi
 export { flapBundleBuyFirstMerkle, type FlapBuyFirstSignConfig, type FlapBuyFirstConfig, type FlapBundleBuyFirstSignParams, type FlapBundleBuyFirstParams, type FlapBuyFirstResult } from './flap/portal-bundle-merkle/swap-buy-first.js';
 export { pancakeBundleBuyFirstMerkle, type PancakeBuyFirstSignConfig, type PancakeBuyFirstConfig, type PancakeBundleBuyFirstSignParams, type PancakeBundleBuyFirstParams, type PancakeBuyFirstResult } from './pancake/bundle-buy-first.js';
 export { PROFIT_CONFIG } from './utils/constants.js';
-export { submitDirectToRpc, submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './contracts/tm-bundle-merkle/submit.js';
+export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './contracts/tm-bundle-merkle/submit.js';

package/dist/index.js

@@ -63,4 +63,5 @@ export { pancakeBundleBuyFirstMerkle } from './pancake/bundle-buy-first.js';
 // ✅ 硬编码利润配置（统一管理）
 export { PROFIT_CONFIG } from './utils/constants.js';
 // ✅ Monad 等不支持 Bundle 的链：逐笔 RPC 广播方法（服务器端使用）
-export { submitDirectToRpc, submitDirectToRpcParallel } from './contracts/tm-bundle-merkle/submit.js';
+export { submitDirectToRpc, submitDirectToRpcSequential, // ✅ 新增：顺序广播并等待确认（用于多跳）
+submitDirectToRpcParallel } from './contracts/tm-bundle-merkle/submit.js';

package/package.json

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