four-flap-meme-sdk 2.2.1 → 2.2.2

package/dist/shared/flap/portal-bundle-merkle/curve-to-dex.js

@@ -7,12 +7,11 @@
  * 3. 多个钱包在 PancakeSwap（外盘）继续买入
  */
 import { ethers, Contract, Wallet } from 'ethers';
-import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
+import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT } from '../../../utils/bundle-helpers.js';
 import { FLAP_PORTAL_ADDRESSES } from '../constants.js';
-import { ADDRESSES, ZERO_ADDRESS } from '../../../shared/constants/index.js';
+import { PROFIT_CONFIG, ADDRESSES, ZERO_ADDRESS } from '../../../utils/constants.js';
 import { GAS_LIMITS } from '../../constants/index.js';
-import { getGasPriceConfig, getTxType, getProfitRecipient, getProfitRateBps, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI, } from './config.js';
-import { createSignProvider } from '../../../bundle-core/sign-context-helpers.js';
+import { getGasPriceConfig, getTxType, getProfitRecipient, getBribeAmount, BLOCKRAZOR_BUILDER_EOA, PORTAL_ABI } from './config.js';
 // ==================== 链常量 ====================
 // ✅ V2/V3 统一使用 PancakeSwap SmartRouter（支持 multicall + V2 swapExactTokensForTokens + V3 exactInputSingle）
 // 参考: flap-bundle-release 官方示例统一使用 smartRouter（0x13f4EA83D0bd40E75C8222255bc855a974568Dd4）
@@ -26,59 +25,59 @@ const BASE_WETH = ADDRESSES.BASE.WETH;
 // PancakeSwap Router ABI
 const PANCAKE_V3_ROUTER_ABI = [
     {
-        type: 'function',
-        name: 'exactInputSingle',
-        inputs: [
+        "type": "function",
+        "name": "exactInputSingle",
+        "inputs": [
             {
-                name: 'params',
-                type: 'tuple',
-                components: [
-                    { name: 'tokenIn', type: 'address' },
-                    { name: 'tokenOut', type: 'address' },
-                    { name: 'fee', type: 'uint24' },
-                    { name: 'recipient', type: 'address' },
-                    { name: 'amountIn', type: 'uint256' },
-                    { name: 'amountOutMinimum', type: 'uint256' },
-                    { name: 'sqrtPriceLimitX96', type: 'uint160' },
-                ],
-            },
+                "name": "params",
+                "type": "tuple",
+                "components": [
+                    { "name": "tokenIn", "type": "address" },
+                    { "name": "tokenOut", "type": "address" },
+                    { "name": "fee", "type": "uint24" },
+                    { "name": "recipient", "type": "address" },
+                    { "name": "amountIn", "type": "uint256" },
+                    { "name": "amountOutMinimum", "type": "uint256" },
+                    { "name": "sqrtPriceLimitX96", "type": "uint160" }
+                ]
+            }
         ],
-        outputs: [{ name: 'amountOut', type: 'uint256' }],
-        stateMutability: 'payable',
+        "outputs": [{ "name": "amountOut", "type": "uint256" }],
+        "stateMutability": "payable"
     },
     {
-        type: 'function',
-        name: 'multicall',
-        inputs: [{ name: 'data', type: 'bytes[]' }],
-        outputs: [{ name: 'results', type: 'bytes[]' }],
-        stateMutability: 'payable',
+        "type": "function",
+        "name": "multicall",
+        "inputs": [{ "name": "data", "type": "bytes[]" }],
+        "outputs": [{ "name": "results", "type": "bytes[]" }],
+        "stateMutability": "payable"
     },
     {
-        type: 'function',
-        name: 'selfPermit',
-        inputs: [
-            { name: 'token', type: 'address' },
-            { name: 'value', type: 'uint256' },
-            { name: 'deadline', type: 'uint256' },
-            { name: 'v', type: 'uint8' },
-            { name: 'r', type: 'bytes32' },
-            { name: 's', type: 'bytes32' },
+        "type": "function",
+        "name": "selfPermit",
+        "inputs": [
+            { "name": "token", "type": "address" },
+            { "name": "value", "type": "uint256" },
+            { "name": "deadline", "type": "uint256" },
+            { "name": "v", "type": "uint8" },
+            { "name": "r", "type": "bytes32" },
+            { "name": "s", "type": "bytes32" }
         ],
-        outputs: [],
-        stateMutability: 'payable',
+        "outputs": [],
+        "stateMutability": "payable"
     },
     {
-        type: 'function',
-        name: 'swapExactTokensForTokens',
-        inputs: [
-            { name: 'amountIn', type: 'uint256' },
-            { name: 'amountOutMin', type: 'uint256' },
-            { name: 'path', type: 'address[]' },
-            { name: 'to', type: 'address' },
+        "type": "function",
+        "name": "swapExactTokensForTokens",
+        "inputs": [
+            { "name": "amountIn", "type": "uint256" },
+            { "name": "amountOutMin", "type": "uint256" },
+            { "name": "path", "type": "address[]" },
+            { "name": "to", "type": "address" }
         ],
-        outputs: [{ name: 'amountOut', type: 'uint256' }],
-        stateMutability: 'payable',
-    },
+        "outputs": [{ "name": "amountOut", "type": "uint256" }],
+        "stateMutability": "payable"
+    }
 ];
 // ==================== 链配置 ====================
 function getCurveToDexChainConfig(chain) {
@@ -137,7 +136,7 @@ function splitAmount(totalAmount, count) {
  * 5. 利润多跳转账
  */
 export async function flapBundleCurveToDex(params) {
-    const { chain, tokenAddress, quoteToken, quoteTokenDecimals = 18, curveBuyers, curveTotalBuyAmount, triggerGraduate = true, graduateWallet, dexBuyers = [], dexTotalBuyAmount, dexPoolType = 'v3', v3Fee = 2500, config, } = params;
+    const { chain, tokenAddress, quoteToken, quoteTokenDecimals = 18, curveBuyers, curveTotalBuyAmount, triggerGraduate = true, graduateWallet, dexBuyers = [], dexTotalBuyAmount, dexPoolType = 'v3', v3Fee = 2500, config } = params;
     // 验证参数
     if (curveBuyers.length === 0) {
         throw new Error('至少需要一个内盘买入钱包');
@@ -149,39 +148,40 @@ export async function flapBundleCurveToDex(params) {
     const chainConfig = getCurveToDexChainConfig(chain);
     const chainId = chainConfig.chainId;
     // 创建 Provider
-    const provider = createSignProvider(config.rpcUrl, chainId, chain.toUpperCase());
+    const provider = new ethers.JsonRpcProvider(config.rpcUrl, {
+        chainId,
+        name: chain.toUpperCase()
+    });
     const portalAddress = FLAP_PORTAL_ADDRESSES[chain.toUpperCase()];
     const nonceManager = new NonceManager(provider);
     // 创建钱包实例
-    const curveWallets = curveBuyers.map((b) => ({
+    const curveWallets = curveBuyers.map(b => ({
         wallet: new Wallet(b.privateKey, provider),
-        buyAmount: b.buyAmount,
+        buyAmount: b.buyAmount
     }));
-    const graduateWalletInfo = graduateWallet
-        ? {
-            wallet: new Wallet(graduateWallet.privateKey, provider),
-            buyAmount: graduateWallet.buyAmount,
-        }
-        : null;
-    const dexWallets = dexBuyers.map((b) => ({
+    const graduateWalletInfo = graduateWallet ? {
+        wallet: new Wallet(graduateWallet.privateKey, provider),
+        buyAmount: graduateWallet.buyAmount
+    } : null;
+    const dexWallets = dexBuyers.map(b => ({
         wallet: new Wallet(b.privateKey, provider),
-        buyAmount: b.buyAmount,
+        buyAmount: b.buyAmount
     }));
     // 使用第一个内盘买家作为主钱包（支付贿赂和利润）
     const mainWallet = curveWallets[0].wallet;
     // ✅ 第一批并行：获取 gasPrice + 所有钱包 nonces
     const allWallets = [
-        ...curveWallets.map((c) => c.wallet),
+        ...curveWallets.map(c => c.wallet),
         ...(graduateWalletInfo ? [graduateWalletInfo.wallet] : []),
-        ...dexWallets.map((d) => d.wallet),
+        ...dexWallets.map(d => d.wallet)
     ];
     const uniqueWallets = allWallets.filter((w, i) => {
         const addr = w.address.toLowerCase();
-        return allWallets.findIndex((x) => x.address.toLowerCase() === addr) === i;
+        return allWallets.findIndex(x => x.address.toLowerCase() === addr) === i;
     });
     const [gasPrice, noncesArray] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-        nonceManager.getNextNoncesForWallets(uniqueWallets),
+        nonceManager.getNextNoncesForWallets(uniqueWallets)
     ]);
     // 构建 nonces Map
     const noncesMap = new Map();
@@ -203,10 +203,12 @@ export async function flapBundleCurveToDex(params) {
     }
     else {
         // 使用各自指定的金额
-        curveBuyAmounts = curveBuyers.map((b) => {
+        curveBuyAmounts = curveBuyers.map(b => {
             if (!b.buyAmount)
                 throw new Error('未指定 curveTotalBuyAmount 时，每个钱包必须指定 buyAmount');
-            return useNativeToken ? ethers.parseEther(b.buyAmount) : ethers.parseUnits(b.buyAmount, quoteTokenDecimals);
+            return useNativeToken
+                ? ethers.parseEther(b.buyAmount)
+                : ethers.parseUnits(b.buyAmount, quoteTokenDecimals);
         });
     }
     // ✅ 计算毕业买入金额
@@ -231,16 +233,20 @@ export async function flapBundleCurveToDex(params) {
             dexBuyAmounts = splitAmount(total, dexBuyers.length);
         }
         else {
-            dexBuyAmounts = dexBuyers.map((b) => {
+            dexBuyAmounts = dexBuyers.map(b => {
                 if (!b.buyAmount)
                     throw new Error('未指定 dexTotalBuyAmount 时，每个钱包必须指定 buyAmount');
-                return useNativeToken ? ethers.parseEther(b.buyAmount) : ethers.parseUnits(b.buyAmount, quoteTokenDecimals);
+                return useNativeToken
+                    ? ethers.parseEther(b.buyAmount)
+                    : ethers.parseUnits(b.buyAmount, quoteTokenDecimals);
             });
         }
     }
     // ✅ 计算利润
-    const totalBuyAmount = curveBuyAmounts.reduce((a, b) => a + b, 0n) + graduateBuyAmount + dexBuyAmounts.reduce((a, b) => a + b, 0n);
-    const profitAmount = (totalBuyAmount * BigInt(getProfitRateBps())) / 10000n;
+    const totalBuyAmount = curveBuyAmounts.reduce((a, b) => a + b, 0n)
+        + graduateBuyAmount
+        + dexBuyAmounts.reduce((a, b) => a + b, 0n);
+    const profitAmount = (totalBuyAmount * BigInt(PROFIT_CONFIG.RATE_BPS)) / 10000n;
     // ==================== 构建交易 ====================
     const allTransactions = [];
     // 1. 贿赂交易
@@ -255,7 +261,7 @@ export async function flapBundleCurveToDex(params) {
             gasPrice,
             gasLimit: GAS_LIMITS.BRIBE,
             chainId,
-            type: txType,
+            type: txType
         });
         allTransactions.push(bribeTx);
     }
@@ -270,7 +276,7 @@ export async function flapBundleCurveToDex(params) {
             outputToken: tokenAddress,
             inputAmount: curveBuyAmounts[i],
             minOutputAmount: 0n,
-            permitData: '0x',
+            permitData: '0x'
         }, useNativeToken ? { value: curveBuyAmounts[i] } : {});
         const tx = {
             ...unsigned,
@@ -279,7 +285,7 @@ export async function flapBundleCurveToDex(params) {
             gasLimit: finalGasLimit,
             chainId,
             type: txType,
-            value: useNativeToken ? curveBuyAmounts[i] : 0n,
+            value: useNativeToken ? curveBuyAmounts[i] : 0n
         };
         if (txType === 2) {
             tx.maxFeePerGas = gasPrice;
@@ -304,16 +310,16 @@ export async function flapBundleCurveToDex(params) {
             outputToken: tokenAddress,
             inputAmount: graduateBuyAmount,
             minOutputAmount: 0n,
-            permitData: '0x',
+            permitData: '0x'
         }, useNativeToken ? { value: graduateBuyAmount } : {});
         const tx = {
             ...unsigned,
             from: wallet.address,
             nonce,
-            gasLimit: BigInt(1_500_000), // 毕业交易需要更多 gas
+            gasLimit: BigInt(1500000), // 毕业交易需要更多 gas
             chainId,
             type: txType,
-            value: useNativeToken ? graduateBuyAmount : 0n,
+            value: useNativeToken ? graduateBuyAmount : 0n
         };
         if (txType === 2) {
             tx.maxFeePerGas = gasPrice;
@@ -347,12 +353,10 @@ export async function flapBundleCurveToDex(params) {
                         recipient: wallet.address,
                         amountIn: buyAmount,
                         amountOutMinimum: 0n,
-                        sqrtPriceLimitX96: 0n,
+                        sqrtPriceLimitX96: 0n
                     };
                     const exactInputSingleData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('exactInputSingle', [params]);
-                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [
-                        [exactInputSingleData],
-                    ]);
+                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[exactInputSingleData]]);
                     value = buyAmount;
                 }
                 else {
@@ -364,34 +368,22 @@ export async function flapBundleCurveToDex(params) {
                         recipient: wallet.address,
                         amountIn: buyAmount,
                         amountOutMinimum: 0n,
-                        sqrtPriceLimitX96: 0n,
+                        sqrtPriceLimitX96: 0n
                     };
                     const exactInputSingleData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('exactInputSingle', [params]);
-                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [
-                        [exactInputSingleData],
-                    ]);
+                    calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[exactInputSingleData]]);
                     value = 0n;
                 }
             }
             else {
                 // V2: swapExactTokensForTokens
                 if (useNativeToken) {
-                    const swapData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('swapExactTokensForTokens', [
-                        buyAmount,
-                        0n,
-                        [wrappedNative, tokenAddress],
-                        wallet.address,
-                    ]);
+                    const swapData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('swapExactTokensForTokens', [buyAmount, 0n, [wrappedNative, tokenAddress], wallet.address]);
                     calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[swapData]]);
                     value = buyAmount;
                 }
                 else {
-                    const swapData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('swapExactTokensForTokens', [
-                        buyAmount,
-                        0n,
-                        [quoteToken, tokenAddress],
-                        wallet.address,
-                    ]);
+                    const swapData = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('swapExactTokensForTokens', [buyAmount, 0n, [quoteToken, tokenAddress], wallet.address]);
                     calldata = new ethers.Interface(PANCAKE_V3_ROUTER_ABI).encodeFunctionData('multicall', [[swapData]]);
                     value = 0n;
                 }
@@ -401,10 +393,10 @@ export async function flapBundleCurveToDex(params) {
                 data: calldata,
                 from: wallet.address,
                 nonce,
-                gasLimit: BigInt(500_000),
+                gasLimit: BigInt(500000),
                 chainId,
                 type: txType,
-                value,
+                value
             };
             if (txType === 2) {
                 tx.maxFeePerGas = gasPrice;
@@ -432,7 +424,7 @@ export async function flapBundleCurveToDex(params) {
             gasPrice,
             chainId,
             txType,
-            startNonce: profitNonce,
+            startNonce: profitNonce
         });
         allTransactions.push(...profitResult.signedTransactions);
         profitHopWallets = profitResult.hopWallets;
@@ -448,7 +440,7 @@ export async function flapBundleCurveToDex(params) {
             graduated: triggerGraduate,
             dexBuyerCount: dexBuyers.length,
             dexTotalBuy: ethers.formatEther(dexBuyAmounts.reduce((a, b) => a + b, 0n)),
-            profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined,
-        },
+            profitAmount: profitAmount > 0n ? ethers.formatEther(profitAmount) : undefined
+        }
     };
 }

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

@@ -5,14 +5,10 @@
 export * from './config.js';
 export * from './types.js';
 export { createTokenWithBundleBuyMerkle, batchBuyWithBundleMerkle, batchSellWithBundleMerkle } from './core.js';
-export { flapBundleBuyFirstMerkle } from './swap-buy-first.js';
-export type { FlapChain, FlapBuyFirstSignConfig, FlapBuyFirstConfig, FlapBundleBuyFirstSignParams, FlapBundleBuyFirstParams, FlapBuyFirstResult, } from './swap-buy-first-helpers.js';
-export { flapPrivateBuyMerkle, flapPrivateSellMerkle, flapBatchPrivateBuyMerkle, flapBatchPrivateSellMerkle, } from './private.js';
-export { pancakeProxyBatchBuyMerkle, pancakeProxyBatchSellMerkle, approvePancakeProxy, approvePancakeProxyBatch, } from './pancake-proxy.js';
-export { flapDisperseWithBundleMerkle, flapSweepWithBundleMerkle } from './utils.js';
-export type { FlapDisperseSignParams, FlapDisperseMerkleResult, FlapSweepSignParams, FlapSweepMerkleResult, } from './types.js';
-export { flapBundleCurveToDex, type CurveToDexChain, type DexPoolType, type CurveToDexSignConfig, type CurveBuyerConfig, type DexBuyerConfig, type FlapCurveToDexParams, type FlapCurveToDexResult, } from './curve-to-dex.js';
-export { flapBundleCreateToDex, type CreateToDexChain, type CreateToDexSignConfig, type CreateTokenInfo, type FlapCreateToDexParams, type FlapCreateToDexResult, type CurveBuyerConfig as CreateCurveBuyerConfig, type DexBuyerConfig as CreateDexBuyerConfig, type DexPoolType as CreateDexPoolType, } from './create-to-dex.js';
-export { flapBundleSwapMerkle, flapBatchSwapMerkle, flapQuickBatchSwapMerkle, flapCrossSwapMerkle } from './swap.js';
-export type { FlapSwapSignConfig, FlapSwapConfig, FlapBundleSwapSignParams, FlapBundleSwapParams, FlapSwapResult, UserType, } from './swap-helpers.js';
-export type { FlapBatchSwapSignParams, FlapBatchSwapResult, FlapQuickBatchSwapSignParams, FlapQuickBatchSwapResult, FlapCrossSwapParams, FlapCrossSwapResult, } from './swap.js';
+export { flapBundleBuyFirstMerkle, type FlapChain, type FlapBuyFirstSignConfig, type FlapBuyFirstConfig, type FlapBundleBuyFirstSignParams, type FlapBundleBuyFirstParams, type FlapBuyFirstResult } from './swap-buy-first.js';
+export { flapPrivateBuyMerkle, flapPrivateSellMerkle, flapBatchPrivateBuyMerkle, flapBatchPrivateSellMerkle } from './private.js';
+export { pancakeProxyBatchBuyMerkle, pancakeProxyBatchSellMerkle, approvePancakeProxy, approvePancakeProxyBatch } from './pancake-proxy.js';
+export { flapDisperseWithBundleMerkle, flapSweepWithBundleMerkle, type FlapDisperseSignParams, type FlapDisperseMerkleResult, type FlapSweepSignParams, type FlapSweepMerkleResult } from './utils.js';
+export { flapBundleCurveToDex, type CurveToDexChain, type DexPoolType, type CurveToDexSignConfig, type CurveBuyerConfig, type DexBuyerConfig, type FlapCurveToDexParams, type FlapCurveToDexResult } from './curve-to-dex.js';
+export { flapBundleCreateToDex, type CreateToDexChain, type CreateToDexSignConfig, type CreateTokenInfo, type FlapCreateToDexParams, type FlapCreateToDexResult, type CurveBuyerConfig as CreateCurveBuyerConfig, type DexBuyerConfig as CreateDexBuyerConfig, type DexPoolType as CreateDexPoolType } from './create-to-dex.js';
+export { flapBundleSwapMerkle, flapBatchSwapMerkle, flapQuickBatchSwapMerkle, flapCrossSwapMerkle, type FlapSwapSignConfig, type FlapSwapConfig, type FlapBundleSwapSignParams, type FlapBundleSwapParams, type FlapSwapResult, type FlapBatchSwapSignParams, type FlapBatchSwapResult, type FlapQuickBatchSwapSignParams, type FlapQuickBatchSwapResult, type FlapCrossSwapParams, type FlapCrossSwapResult, type UserType } from './swap.js';

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

@@ -10,14 +10,17 @@ export { createTokenWithBundleBuyMerkle, batchBuyWithBundleMerkle, batchSellWith
 // BuyFirst 换手方法
 export { flapBundleBuyFirstMerkle } from './swap-buy-first.js';
 // 私有交易方法（使用 Flap Portal）
-export { flapPrivateBuyMerkle, flapPrivateSellMerkle, flapBatchPrivateBuyMerkle, flapBatchPrivateSellMerkle, } from './private.js';
+export { flapPrivateBuyMerkle, flapPrivateSellMerkle, flapBatchPrivateBuyMerkle, flapBatchPrivateSellMerkle } from './private.js';
 // PancakeSwapProxy 代理交易方法（使用自定义代理合约）
-export { pancakeProxyBatchBuyMerkle, pancakeProxyBatchSellMerkle, approvePancakeProxy, approvePancakeProxyBatch, } from './pancake-proxy.js';
+export { pancakeProxyBatchBuyMerkle, pancakeProxyBatchSellMerkle, approvePancakeProxy, approvePancakeProxyBatch } from './pancake-proxy.js';
 // ✅ 归集和分散方法（支持利润提取、余额最大钱包支付、多跳、ERC20→原生代币报价、Multicall3）
 export { flapDisperseWithBundleMerkle, flapSweepWithBundleMerkle } from './utils.js';
 // ✅ 内盘买到外盘（Bonding Curve → DEX）- 已存在代币
-export { flapBundleCurveToDex, } from './curve-to-dex.js';
+export { flapBundleCurveToDex } from './curve-to-dex.js';
 // ✅ 发币 + 一键买到外盘（Create → Curve → DEX）- 新代币
-export { flapBundleCreateToDex, } from './create-to-dex.js';
+export { flapBundleCreateToDex } from './create-to-dex.js';
 // ✅ 内盘换手方法（一卖一买、一卖多买、快捷资金利用率、交叉换手）
 export { flapBundleSwapMerkle, flapBatchSwapMerkle, flapQuickBatchSwapMerkle, flapCrossSwapMerkle } from './swap.js';
+// ✅ Tax Vault 金库类型（types.ts 中 TaxV2Config.vaultConfig 使用的类型）
+// 注意：TaxVaultConfig 完整导出在 flap/index.ts → vault.js 中
+// 这里仅从 types.ts 导出 TaxV2Config 中嵌套使用时的类型引用