four-flap-meme-sdk 2.2.0 → 2.2.2

package/dist/chains/eni/platforms/daoaas/portal-direct.js

@@ -5,7 +5,7 @@
  * 等同于 BSC EOA 普通模式 / Monad direct 模式
  */
 import { Wallet, JsonRpcProvider } from 'ethers';
-import { ENI_CHAIN_ID, ENI_RPC_URL, DAOAAS_PORTAL, NATIVE_TRANSFER_GAS_LIMIT } from '../../constants.js';
+import { ENI_CHAIN_ID, ENI_RPC_URL, DAOAAS_PORTAL, NATIVE_TRANSFER_GAS_LIMIT, } from '../../constants.js';
 import { encodeBuyCall, encodeSellCall, applySlippage, DaoaasPortalQuery } from './portal.js';
 import { getProfitRecipient, getProfitRateBps, calculateProfitAmount } from '../../../../shared/constants/profit.js';
 const NORMAL_PROFIT_BPS = getProfitRateBps('normal');
@@ -45,7 +45,7 @@ export async function directBuy(params) {
     const provider = new JsonRpcProvider(params.rpcUrl ?? ENI_RPC_URL, ENI_CHAIN_ID, { staticNetwork: true });
     const wallet = new Wallet(params.privateKey, provider);
     const calldata = encodeBuyCall(params.token, params.amountOutMin ?? 0n);
-    const nonce = params.nonce ?? (await wallet.getNonce('pending'));
+    const nonce = params.nonce ?? await wallet.getNonce('pending');
     const feeData = await provider.getFeeData();
     const tx = await wallet.signTransaction({
         to: DAOAAS_PORTAL,
@@ -70,7 +70,7 @@ export async function directSell(params) {
     const provider = new JsonRpcProvider(params.rpcUrl ?? ENI_RPC_URL, ENI_CHAIN_ID, { staticNetwork: true });
     const wallet = new Wallet(params.privateKey, provider);
     const calldata = encodeSellCall(params.token, params.tokenAmount, params.amountOutMin ?? 0n);
-    const nonce = params.nonce ?? (await wallet.getNonce('pending'));
+    const nonce = params.nonce ?? await wallet.getNonce('pending');
     const feeData = await provider.getFeeData();
     const tx = await wallet.signTransaction({
         to: DAOAAS_PORTAL,
@@ -260,7 +260,7 @@ export async function directSellForSubmit(params) {
     };
 }
 export async function directBatchBuyForSubmit(params) {
-    const { rpcUrl = ENI_RPC_URL, token, privateKeys: rawKeys, amounts: rawAmounts, slippageBps = 100, gasPrice, } = params;
+    const { rpcUrl = ENI_RPC_URL, token, privateKeys: rawKeys, amounts: rawAmounts, slippageBps = 100, gasPrice } = params;
     if (rawKeys.length !== rawAmounts.length) {
         throw new Error(`privateKeys.length (${rawKeys.length}) !== amounts.length (${rawAmounts.length})`);
     }
@@ -277,8 +277,8 @@ export async function directBatchBuyForSubmit(params) {
     const totalFlowRaw = rawAmounts.reduce((sum, amount) => sum + amount, 0n);
     const profitAmountFull = calculateProfitAmount(totalFlowRaw, NORMAL_PROFIT_BPS) + profitTxGasCost;
     const maxPayerIdx = pickMaxAmountIndex(rawAmounts);
-    const wallets = rawKeys.map((pk) => new Wallet(pk, provider));
-    const balances = await Promise.all(wallets.map((w) => provider.getBalance(w.address)));
+    const wallets = rawKeys.map(pk => new Wallet(pk, provider));
+    const balances = await Promise.all(wallets.map(w => provider.getBalance(w.address)));
     let privateKeys = rawKeys;
     let amounts = rawAmounts;
     const validIndices = [];
@@ -287,6 +287,7 @@ export async function directBatchBuyForSubmit(params) {
         if (i === maxPayerIdx)
             required += profitAmountFull + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
         if (balances[i] < required) {
+            console.warn(`[DAOAAS BatchBuy] 钱包 ${wallets[i].address.slice(0, 10)} 余额不足: 余额=${balances[i]}, 需要=${required}，跳过`);
             continue;
         }
         validIndices.push(i);
@@ -295,8 +296,9 @@ export async function directBatchBuyForSubmit(params) {
         throw new Error('所有钱包余额不足（含 swap + gas），无法执行 DAOAAS 买入');
     }
     if (validIndices.length < rawKeys.length) {
-        privateKeys = validIndices.map((i) => rawKeys[i]);
-        amounts = validIndices.map((i) => rawAmounts[i]);
+        privateKeys = validIndices.map(i => rawKeys[i]);
+        amounts = validIndices.map(i => rawAmounts[i]);
+        console.log(`[DAOAAS BatchBuy] 余额预检: ${rawKeys.length - validIndices.length} 个钱包被跳过, 剩余 ${validIndices.length} 个`);
     }
     const transactions = [];
     const totalFlow = amounts.reduce((sum, amount) => sum + amount, 0n);
@@ -304,7 +306,9 @@ export async function directBatchBuyForSubmit(params) {
     for (let i = 0; i < privateKeys.length; i++) {
         const wallet = new Wallet(privateKeys[i], provider);
         const preview = await query.previewBuy(token, amounts[i]);
-        const effectiveSlippage = isBatch ? Math.min(9500, slippageBps + i * 2000) : slippageBps;
+        const effectiveSlippage = isBatch
+            ? Math.min(9500, slippageBps + i * 2000)
+            : slippageBps;
         const minOut = applySlippage(preview, effectiveSlippage);
         const calldata = encodeBuyCall(token, minOut);
         const nonce = await wallet.getNonce('pending');
@@ -333,7 +337,7 @@ export async function directBatchBuyForSubmit(params) {
     });
     return {
         transactions,
-        signedTransactions: [...transactions.map((tx) => tx.signedTx), profitTx.signedTx],
+        signedTransactions: [...transactions.map(tx => tx.signedTx), profitTx.signedTx],
         totalGasCost: swapGasLimit * maxFeePerGas * BigInt(transactions.length) + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas,
         metadata: formatSubmitMetadata(totalFlow, profitAmount),
     };
@@ -352,7 +356,19 @@ export async function directBatchSellForSubmit(params) {
     const maxFeePerGas = gasPrice ?? feeData.maxFeePerGas ?? feeData.gasPrice ?? 1000000000n;
     const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? 0n;
     const swapGasLimit = 300000n;
-    const wallets = privateKeys.map((pk) => new Wallet(pk, provider));
+    const swapGasCost = swapGasLimit * maxFeePerGas;
+    const profitGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
+    const wallets = privateKeys.map(pk => new Wallet(pk, provider));
+    const balances = await Promise.all(wallets.map(w => provider.getBalance(w.address)));
+    const maxPayerIdx = pickMaxAmountIndex(tokenAmounts);
+    for (let i = 0; i < wallets.length; i++) {
+        let required = swapGasCost;
+        if (i === maxPayerIdx)
+            required += profitGasCost;
+        if (balances[i] < required) {
+            console.warn(`[DAOAAS BatchSell] 钱包 ${wallets[i].address.slice(0, 10)} 原生余额不足 gas: 余额=${balances[i]}, 需要=${required}，可能导致交易失败`);
+        }
+    }
     const transactions = [];
     const estimatedOuts = [];
     const isBatch = privateKeys.length > 1;
@@ -360,7 +376,9 @@ export async function directBatchSellForSubmit(params) {
         const wallet = wallets[i];
         const preview = await query.previewSell(token, tokenAmounts[i]);
         estimatedOuts.push(preview);
-        const effectiveSlippage = isBatch ? Math.min(9500, slippageBps + i * 2000) : slippageBps;
+        const effectiveSlippage = isBatch
+            ? Math.min(9500, slippageBps + i * 2000)
+            : slippageBps;
         const minOut = applySlippage(preview, effectiveSlippage);
         const calldata = encodeSellCall(token, tokenAmounts[i], minOut);
         const nonce = await wallet.getNonce('pending');
@@ -390,7 +408,7 @@ export async function directBatchSellForSubmit(params) {
     });
     return {
         transactions,
-        signedTransactions: [...transactions.map((tx) => tx.signedTx), profitTx.signedTx],
+        signedTransactions: [...transactions.map(tx => tx.signedTx), profitTx.signedTx],
         totalGasCost: 300000n * maxFeePerGas * BigInt(transactions.length) + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas,
         metadata: formatSubmitMetadata(totalFlow, profitAmount),
     };
@@ -421,9 +439,9 @@ export async function directQuickSwapForSubmit(params) {
     if (params.sellerKeys.length > 1) {
         for (let i = 1; i < params.sellerKeys.length; i++) {
             const otherWallet = new Wallet(params.sellerKeys[i], provider);
-            const otherSellTxs = sellResult.transactions.filter((tx) => tx.from.toLowerCase() === otherWallet.address.toLowerCase());
+            const otherSellTxs = sellResult.transactions.filter(tx => tx.from.toLowerCase() === otherWallet.address.toLowerCase());
             const otherNextNonce = otherSellTxs.length > 0
-                ? Math.max(...otherSellTxs.map((tx) => tx.nonce)) + 1
+                ? Math.max(...otherSellTxs.map(tx => tx.nonce)) + 1
                 : await otherWallet.getNonce('pending');
             const otherBalance = await provider.getBalance(otherWallet.address);
             const reserveGas = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
@@ -447,23 +465,23 @@ export async function directQuickSwapForSubmit(params) {
     const hopCount = params.hopCount ?? 0;
     const distributeHopWallets = [];
     if (params.buyerKeys.length > 0) {
-        const primarySellTxs = sellResult.transactions.filter((tx) => tx.from.toLowerCase() === primarySellerAddress);
+        const primarySellTxs = sellResult.transactions.filter(tx => tx.from.toLowerCase() === primarySellerAddress);
         let primaryNextNonce = primarySellTxs.length > 0
-            ? Math.max(...primarySellTxs.map((tx) => tx.nonce)) + 1
+            ? Math.max(...primarySellTxs.map(tx => tx.nonce)) + 1
             : await primarySellerWallet.getNonce('pending');
         const gasForBuy = 300000n * maxFeePerGas;
         const hopGasFee = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
         const totalFlow = params.buyAmounts.reduce((sum, a) => sum + a, 0n);
         const profitTxGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
         const profitAmount = calculateProfitAmount(totalFlow, NORMAL_PROFIT_BPS) + profitTxGasCost;
-        const profitGasPerBuyer = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
+        const profitGasPerBuyer = (NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas);
         for (let i = 0; i < params.buyerKeys.length; i++) {
             const buyerAddress = new Wallet(params.buyerKeys[i]).address;
             const transferAmount = params.buyAmounts[i];
             if (transferAmount <= 0n)
                 continue;
             const isMaxBuyer = i === pickMaxAmountIndex(params.buyAmounts);
-            const extraForProfit = isMaxBuyer ? profitAmount + profitGasPerBuyer : 0n;
+            const extraForProfit = isMaxBuyer ? (profitAmount + profitGasPerBuyer) : 0n;
             const baseTransfer = transferAmount + gasForBuy + extraForProfit;
             if (hopCount <= 0) {
                 const signedTx = await primarySellerWallet.signTransaction({
@@ -486,8 +504,8 @@ export async function directQuickSwapForSubmit(params) {
                     hops.push({ address: w.address, privateKey: w.privateKey });
                 }
                 distributeHopWallets.push(hops);
-                const fullChain = [primarySellerWallet, ...hops.map((h) => new Wallet(h.privateKey))];
-                const addresses = [...fullChain.map((w) => w.address), buyerAddress];
+                const fullChain = [primarySellerWallet, ...hops.map(h => new Wallet(h.privateKey))];
+                const addresses = [...fullChain.map(w => w.address), buyerAddress];
                 for (let j = 0; j < addresses.length - 1; j++) {
                     const fromWallet = fullChain[j];
                     const toAddress = addresses[j + 1];
@@ -527,10 +545,8 @@ export async function directQuickSwapForSubmit(params) {
     const payerIndex = pickMaxAmountIndex(params.buyAmounts);
     const payerKey = params.buyerKeys[payerIndex] || primarySellerKey;
     const payerAddress = new Wallet(payerKey).address.toLowerCase();
-    const payerTxs = allTxs.filter((tx) => tx.from.toLowerCase() === payerAddress);
-    const payerNonce = payerTxs.length > 0
-        ? Math.max(...payerTxs.map((tx) => tx.nonce)) + 1
-        : await new Wallet(payerKey, provider).getNonce('pending');
+    const payerTxs = allTxs.filter(tx => tx.from.toLowerCase() === payerAddress);
+    const payerNonce = payerTxs.length > 0 ? Math.max(...payerTxs.map(tx => tx.nonce)) + 1 : await new Wallet(payerKey, provider).getNonce('pending');
     const profitTx = await buildRevenueTail({
         rpcUrl,
         payerKey,
@@ -542,7 +558,7 @@ export async function directQuickSwapForSubmit(params) {
     const distributeGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas * BigInt(distributeTxs.length);
     return {
         transactions: allTxs,
-        signedTransactions: [...allTxs.map((tx) => tx.signedTx), profitTx.signedTx],
+        signedTransactions: [...allTxs.map(tx => tx.signedTx), profitTx.signedTx],
         totalGasCost: sellResult.totalGasCost + distributeGasCost + buyResult.totalGasCost + NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas,
         metadata: formatSubmitMetadata(totalFlow, profitAmount),
         ...(distributeHopWallets.length > 0 ? { hopWallets: distributeHopWallets } : {}),
@@ -556,11 +572,11 @@ export async function directQuickSwapForSubmit(params) {
  * ENI 不需要多跳，直接转到收益地址
  */
 export async function buildProfitTransfer(params) {
-    const { rpcUrl = ENI_RPC_URL, payerKey, profitAmount, gasPrice, nonce: explicitNonce, maxFeePerGas, maxPriorityFeePerGas, } = params;
+    const { rpcUrl = ENI_RPC_URL, payerKey, profitAmount, gasPrice, nonce: explicitNonce, maxFeePerGas, maxPriorityFeePerGas } = params;
     const provider = new JsonRpcProvider(rpcUrl, ENI_CHAIN_ID, { staticNetwork: true });
     const wallet = new Wallet(payerKey, provider);
     const feeData = await provider.getFeeData();
-    const nonce = explicitNonce ?? (await wallet.getNonce('pending'));
+    const nonce = explicitNonce ?? await wallet.getNonce('pending');
     const resolvedMaxFeePerGas = maxFeePerGas ?? gasPrice ?? feeData.maxFeePerGas ?? feeData.gasPrice ?? 1000000000n;
     const resolvedMaxPriorityFeePerGas = maxPriorityFeePerGas ?? feeData.maxPriorityFeePerGas ?? 0n;
     const signedTx = await wallet.signTransaction({

package/dist/chains/eni/platforms/daoaas/portal.js

@@ -5,8 +5,8 @@
  * 接口与 Flap Portal 不兼容，独立实现
  */
 import { Contract, Interface, JsonRpcProvider, formatEther, parseEther } from 'ethers';
-import { DAOAAS_PORTAL, DAOAAS_PORTAL_ABI, ENI_CHAIN_ID, ENI_MULTICALL3, ENI_RPC_URL } from '../../constants.js';
-import { ERC20_ABI, MULTICALL3_ABI } from '../../../../abis/common.js';
+import { DAOAAS_PORTAL, DAOAAS_PORTAL_ABI, ENI_CHAIN_ID, ENI_MULTICALL3, ENI_RPC_URL, } from '../../constants.js';
+import { ERC20_ABI, MULTICALL3_ABI } from '../../../../shared/abis/common.js';
 const portalIface = new Interface(DAOAAS_PORTAL_ABI);
 const erc20Iface = new Interface(ERC20_ABI);
 const multicallIface = new Interface(MULTICALL3_ABI);
@@ -34,10 +34,6 @@ export function encodeTransferCall(to, amount) {
     return erc20Iface.encodeFunctionData('transfer', [to, amount]);
 }
 export class DaoaasPortalQuery {
-    provider;
-    portal;
-    portalAddress;
-    multicall3Address;
     constructor(config = {}) {
         const rpcUrl = config.rpcUrl ?? ENI_RPC_URL;
         this.provider = new JsonRpcProvider(rpcUrl, ENI_CHAIN_ID, { staticNetwork: true });
@@ -60,7 +56,7 @@ export class DaoaasPortalQuery {
     /** 获取代币完整状态（链上 getTokenState 仅返回 uint256 状态码，其余数据分别查询） */
     async getTokenState(token) {
         const status = Number(await this.portal.getTokenState(token));
-        const price = (await this.portal.getPrice(token));
+        const price = await this.portal.getPrice(token);
         const tokenContract = new Contract(token, ERC20_ABI, this.provider);
         const [totalSupply, portalBalance, name, symbol] = await Promise.all([
             tokenContract.totalSupply(),
@@ -73,7 +69,7 @@ export class DaoaasPortalQuery {
     }
     /** 批量获取钱包 EGAS 余额 */
     async getMultipleEgasBalances(addresses) {
-        const calls = addresses.map((addr) => ({
+        const calls = addresses.map(addr => ({
             target: this.multicall3Address,
             allowFailure: true,
             callData: multicallIface.encodeFunctionData('getEthBalance', [addr]),
@@ -89,7 +85,7 @@ export class DaoaasPortalQuery {
     }
     /** 批量获取 ERC20 余额 */
     async getMultipleTokenBalances(token, addresses) {
-        const calls = addresses.map((addr) => ({
+        const calls = addresses.map(addr => ({
             target: token,
             allowFailure: true,
             callData: erc20Iface.encodeFunctionData('balanceOf', [addr]),
@@ -105,7 +101,7 @@ export class DaoaasPortalQuery {
     }
     /** 批量获取 ERC20 allowance */
     async getMultipleAllowances(token, owners, spender) {
-        const calls = owners.map((owner) => ({
+        const calls = owners.map(owner => ({
             target: token,
             allowFailure: true,
             callData: erc20Iface.encodeFunctionData('allowance', [owner, spender]),

package/dist/chains/eni/platforms/dswap/liquidity.js

@@ -9,7 +9,7 @@
  */
 import { Wallet, JsonRpcProvider, Contract, ethers, Interface } from 'ethers';
 import { ENI_CHAIN_ID, ENI_RPC_URL, WEGAS, NATIVE_TRANSFER_GAS_LIMIT, DSWAP_V2_ROUTER, DSWAP_V2_FACTORY, DSWAP_V2_ROUTER_ABI, DSWAP_V2_FACTORY_ABI, DSWAP_V2_PAIR_ABI, } from '../../constants.js';
-import { ERC20_ABI } from '../../../../abis/common.js';
+import { ERC20_ABI } from '../../../../shared/abis/common.js';
 import { getProfitRecipient, getProfitRateBps, calculateProfitAmount } from '../../../../shared/constants/profit.js';
 const DEFAULT_DEADLINE_MINUTES = 20;
 const DEFAULT_SLIPPAGE_PCT = 5;
@@ -25,7 +25,7 @@ function getDeadline(minutes) {
 }
 function applySlippage(amount, slippagePct) {
     const pct = Math.max(0, Math.min(100, slippagePct));
-    return (amount * BigInt(100 - Math.floor(pct))) / 100n;
+    return amount * BigInt(100 - Math.floor(pct)) / 100n;
 }
 async function signProfitTx(params) {
     return params.wallet.signTransaction({
@@ -64,11 +64,17 @@ export async function getLPPairInfo(params) {
     ]);
     let userLPBalance = 0n;
     if (params.userAddress) {
-        userLPBalance = (await pair.balanceOf(params.userAddress));
+        userLPBalance = await pair.balanceOf(params.userAddress);
     }
-    const userShare = totalSupply > 0n ? Number((userLPBalance * 10000n) / totalSupply) / 10000 : 0;
-    const userToken0Amount = totalSupply > 0n ? (reserves[0] * userLPBalance) / totalSupply : 0n;
-    const userToken1Amount = totalSupply > 0n ? (reserves[1] * userLPBalance) / totalSupply : 0n;
+    const userShare = totalSupply > 0n
+        ? Number(userLPBalance * 10000n / totalSupply) / 10000
+        : 0;
+    const userToken0Amount = totalSupply > 0n
+        ? reserves[0] * userLPBalance / totalSupply
+        : 0n;
+    const userToken1Amount = totalSupply > 0n
+        ? reserves[1] * userLPBalance / totalSupply
+        : 0n;
     return {
         pairAddress: pairAddr,
         token0,
@@ -83,7 +89,7 @@ export async function getLPPairInfo(params) {
     };
 }
 export async function batchGetLPPairInfo(params) {
-    return Promise.all(params.tokens.map((token) => getLPPairInfo({ rpcUrl: params.rpcUrl, token, userAddress: params.userAddress })));
+    return Promise.all(params.tokens.map(token => getLPPairInfo({ rpcUrl: params.rpcUrl, token, userAddress: params.userAddress })));
 }
 // ============================================================================
 // 创建/添加 流动性 — EGAS + Token
@@ -117,12 +123,7 @@ export async function addLiquidityETHForSubmit(params) {
     const amountTokenMin = applySlippage(amountTokenDesired, slippage);
     const amountETHMin = applySlippage(amountETHDesired, slippage);
     const addLiqData = routerIface.encodeFunctionData('addLiquidityETH', [
-        token,
-        amountTokenDesired,
-        amountTokenMin,
-        amountETHMin,
-        wallet.address,
-        deadline,
+        token, amountTokenDesired, amountTokenMin, amountETHMin, wallet.address, deadline,
     ]);
     const addLiqTx = await wallet.signTransaction({
         to: DSWAP_V2_ROUTER,
@@ -139,13 +140,7 @@ export async function addLiquidityETHForSubmit(params) {
     const profitTxGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
     const profitAmount = calculateProfitAmount(amountETHDesired, PROFIT_BPS) + profitTxGasCost;
     if (profitAmount > 0n) {
-        const profitTx = await signProfitTx({
-            wallet,
-            nonce: currentNonce,
-            profitAmount,
-            maxFeePerGas,
-            maxPriorityFeePerGas,
-        });
+        const profitTx = await signProfitTx({ wallet, nonce: currentNonce, profitAmount, maxFeePerGas, maxPriorityFeePerGas });
         signedTxs.push(profitTx);
     }
     return { signedTransactions: signedTxs };
@@ -170,7 +165,7 @@ export async function removeLiquidityETHForSubmit(params) {
     const pair = new Contract(pairAddr, DSWAP_V2_PAIR_ABI, provider);
     let liquidity = params.liquidity;
     if (liquidity === 0n) {
-        liquidity = (await pair.balanceOf(wallet.address));
+        liquidity = await pair.balanceOf(wallet.address);
         if (liquidity === 0n)
             throw new Error('No LP tokens to remove');
     }
@@ -182,8 +177,8 @@ export async function removeLiquidityETHForSubmit(params) {
     const isToken0 = token.toLowerCase() === token0.toLowerCase();
     const reserveToken = isToken0 ? reserves[0] : reserves[1];
     const reserveETH = isToken0 ? reserves[1] : reserves[0];
-    const amountTokenExpected = (reserveToken * liquidity) / totalSupply;
-    const amountETHExpected = (reserveETH * liquidity) / totalSupply;
+    const amountTokenExpected = reserveToken * liquidity / totalSupply;
+    const amountETHExpected = reserveETH * liquidity / totalSupply;
     const amountTokenMin = applySlippage(amountTokenExpected, slippage);
     const amountETHMin = applySlippage(amountETHExpected, slippage);
     let currentNonce = await wallet.getNonce();
@@ -203,12 +198,7 @@ export async function removeLiquidityETHForSubmit(params) {
         signedTxs.push(approveTx);
     }
     const removeLiqData = routerIface.encodeFunctionData('removeLiquidityETHSupportingFeeOnTransferTokens', [
-        token,
-        liquidity,
-        amountTokenMin,
-        amountETHMin,
-        wallet.address,
-        deadline,
+        token, liquidity, amountTokenMin, amountETHMin, wallet.address, deadline,
     ]);
     const removeLiqTx = await wallet.signTransaction({
         to: DSWAP_V2_ROUTER,
@@ -225,13 +215,7 @@ export async function removeLiquidityETHForSubmit(params) {
     const profitTxGasCost = NATIVE_TRANSFER_GAS_LIMIT * maxFeePerGas;
     const profitAmount = calculateProfitAmount(amountETHExpected, PROFIT_BPS) + profitTxGasCost;
     if (profitAmount > 0n) {
-        const profitTx = await signProfitTx({
-            wallet,
-            nonce: currentNonce,
-            profitAmount,
-            maxFeePerGas,
-            maxPriorityFeePerGas,
-        });
+        const profitTx = await signProfitTx({ wallet, nonce: currentNonce, profitAmount, maxFeePerGas, maxPriorityFeePerGas });
         signedTxs.push(profitTx);
     }
     return { signedTransactions: signedTxs };
@@ -250,10 +234,7 @@ export async function addLiquidityForSubmit(params) {
     const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? 0n;
     let currentNonce = await wallet.getNonce();
     const signedTxs = [];
-    for (const [token, amount] of [
-        [tokenA, amountADesired],
-        [tokenB, amountBDesired],
-    ]) {
+    for (const [token, amount] of [[tokenA, amountADesired], [tokenB, amountBDesired]]) {
         const erc20 = new Contract(token, ERC20_ABI, provider);
         const allowance = await erc20.allowance(wallet.address, DSWAP_V2_ROUTER);
         if (allowance < amount) {
@@ -273,14 +254,7 @@ export async function addLiquidityForSubmit(params) {
     const amountAMin = applySlippage(amountADesired, slippage);
     const amountBMin = applySlippage(amountBDesired, slippage);
     const addLiqData = routerIface.encodeFunctionData('addLiquidity', [
-        tokenA,
-        tokenB,
-        amountADesired,
-        amountBDesired,
-        amountAMin,
-        amountBMin,
-        wallet.address,
-        deadline,
+        tokenA, tokenB, amountADesired, amountBDesired, amountAMin, amountBMin, wallet.address, deadline,
     ]);
     const addLiqTx = await wallet.signTransaction({
         to: DSWAP_V2_ROUTER,
@@ -316,7 +290,7 @@ export async function removeLiquidityForSubmit(params) {
     const pair = new Contract(pairAddr, DSWAP_V2_PAIR_ABI, provider);
     let liquidity = params.liquidity;
     if (liquidity === 0n) {
-        liquidity = (await pair.balanceOf(wallet.address));
+        liquidity = await pair.balanceOf(wallet.address);
         if (liquidity === 0n)
             throw new Error('No LP tokens to remove');
     }
@@ -328,8 +302,8 @@ export async function removeLiquidityForSubmit(params) {
     const isAToken0 = tokenA.toLowerCase() === token0.toLowerCase();
     const reserveA = isAToken0 ? reserves[0] : reserves[1];
     const reserveB = isAToken0 ? reserves[1] : reserves[0];
-    const amountAMin = applySlippage((reserveA * liquidity) / totalSupply, slippage);
-    const amountBMin = applySlippage((reserveB * liquidity) / totalSupply, slippage);
+    const amountAMin = applySlippage(reserveA * liquidity / totalSupply, slippage);
+    const amountBMin = applySlippage(reserveB * liquidity / totalSupply, slippage);
     let currentNonce = await wallet.getNonce();
     const signedTxs = [];
     const lpAllowance = await pair.allowance(wallet.address, DSWAP_V2_ROUTER);
@@ -347,13 +321,7 @@ export async function removeLiquidityForSubmit(params) {
         signedTxs.push(approveTx);
     }
     const removeLiqData = routerIface.encodeFunctionData('removeLiquidity', [
-        tokenA,
-        tokenB,
-        liquidity,
-        amountAMin,
-        amountBMin,
-        wallet.address,
-        deadline,
+        tokenA, tokenB, liquidity, amountAMin, amountBMin, wallet.address, deadline,
     ]);
     const removeLiqTx = await wallet.signTransaction({
         to: DSWAP_V2_ROUTER,

package/dist/chains/eni/platforms/fair-launch/index.d.ts

@@ -9,5 +9,5 @@ export type { LaunchParams, FairLaunchTokenInfo, FairLaunchQueryConfig, FairLaun
 export { LP_FAIR_LAUNCHER_ADDRESS, TOKEN_FACTORY_ADDRESS, POOL_FACTORY_ADDRESS, RATE_BASE, DEAD_ADDRESS, QUOTE_TOKENS, DEFAULT_LOCK_TIME, DEFAULT_RELEASE_PERIOD, DEFAULT_INITIAL_LP, } from './constants.js';
 export { standardPreset, liquidityProvidingPreset, dividendPreset, dividendBuybackPreset, deflationaryPreset, validateLaunchParams, detectLaunchType, } from './presets.js';
 export { FairLauncherQuery, encodeLaunchTokenCall, launchToken, launchTokenForSubmit, setTokenTradeStartTime, setTokenTradeStartTimeForSubmit, } from './launcher.js';
-export { FairPoolQuery, claimFromPool, claimFromPoolForSubmit, batchClaimForSubmit } from './pool.js';
-export type { PoolOverview, PoolClaimParams, PoolClaimResult } from './pool.js';
+export { FairPoolQuery, claimFromPool, claimFromPoolForSubmit, batchClaimForSubmit, } from './pool.js';
+export type { PoolOverview, PoolClaimParams, PoolClaimResult, } from './pool.js';

package/dist/chains/eni/platforms/fair-launch/index.js

@@ -23,4 +23,4 @@ export { FairLauncherQuery, encodeLaunchTokenCall, launchToken, launchTokenForSu
 // ============================================================================
 // 池 (Pool)
 // ============================================================================
-export { FairPoolQuery, claimFromPool, claimFromPoolForSubmit, batchClaimForSubmit } from './pool.js';
+export { FairPoolQuery, claimFromPool, claimFromPoolForSubmit, batchClaimForSubmit, } from './pool.js';

package/dist/chains/eni/platforms/fair-launch/launcher.js

@@ -7,7 +7,7 @@
  * - 查询代币列表
  */
 import { Contract, Interface, Wallet, JsonRpcProvider } from 'ethers';
-import { ENI_CHAIN_ID, ENI_RPC_URL, LP_FAIR_LAUNCHER_ABI, NATIVE_TRANSFER_GAS_LIMIT } from '../../constants.js';
+import { ENI_CHAIN_ID, ENI_RPC_URL, LP_FAIR_LAUNCHER_ABI, NATIVE_TRANSFER_GAS_LIMIT, } from '../../constants.js';
 import { LP_FAIR_LAUNCHER_ADDRESS } from './constants.js';
 import { buildProfitTransfer } from '../daoaas/portal-direct.js';
 import { calculateProfitAmount, getProfitRateBps, getProfitRecipient } from '../../../../shared/constants/profit.js';
@@ -17,8 +17,6 @@ const launcherIface = new Interface(LP_FAIR_LAUNCHER_ABI);
 // 只读查询
 // ============================================================================
 export class FairLauncherQuery {
-    provider;
-    launcher;
     constructor(config = {}) {
         const rpcUrl = config.rpcUrl ?? ENI_RPC_URL;
         this.provider = new JsonRpcProvider(rpcUrl, ENI_CHAIN_ID, { staticNetwork: true });
@@ -259,93 +257,54 @@ export async function launchTokenForSubmit(params) {
 // ============================================================================
 function paramsToTuple(p) {
     return [
-        p.name,
-        p.symbol,
-        p.logo,
-        p.metadata,
-        p.quoteTokenAddr,
-        p.initialLp,
-        p.initialQuote,
-        p.lpAddRate,
-        p.lpAddMin,
-        p.buybackRate,
-        p.buybackMin,
-        p.buybackPath,
-        p.marketingRates,
-        p.marketingAddrs,
-        p.vestingAmount,
-        p.vestingLockEndTime,
-        p.vestingReleaseEndTime,
-        p.vestingRecipients,
-        p.vestingRatios,
-        p.tradeStartTime,
-        p.claimStartTime,
-        p.claimEndTime,
-        p.lockTime,
-        p.releasePeriod,
-        p.maxCount,
-        p.minAmount,
-        p.maxAmount,
-        p.whitelistEnabled,
-        p.whitelistAddrs,
-        p.inviteCodeEnabled,
-        p.inviteCodes,
+        p.name, p.symbol, p.logo, p.metadata,
+        p.quoteTokenAddr, p.initialLp, p.initialQuote,
+        p.lpAddRate, p.lpAddMin,
+        p.buybackRate, p.buybackMin, p.buybackPath,
+        p.marketingRates, p.marketingAddrs,
+        p.vestingAmount, p.vestingLockEndTime, p.vestingReleaseEndTime,
+        p.vestingRecipients, p.vestingRatios,
+        p.tradeStartTime, p.claimStartTime, p.claimEndTime,
+        p.lockTime, p.releasePeriod,
+        p.maxCount, p.minAmount, p.maxAmount,
+        p.whitelistEnabled, p.whitelistAddrs,
+        p.inviteCodeEnabled, p.inviteCodes,
     ];
 }
-function readRawBigint(raw, key, index) {
-    const value = raw[key] ?? raw[index];
-    if (value === undefined || value === null)
-        return 0n;
-    return BigInt(value);
-}
-function readRawString(raw, key, index) {
-    const value = raw[key] ?? raw[index];
-    return typeof value === 'string' ? value : '';
-}
-function readRawStringArray(raw, key, index) {
-    const value = raw[key] ?? raw[index];
-    return Array.isArray(value) ? [...value] : [];
-}
-function readRawBigintArray(raw, key, index) {
-    const value = raw[key] ?? raw[index];
-    if (!Array.isArray(value))
-        return [];
-    return value.map((item) => BigInt(item));
-}
 function parseFairLaunchTokenInfo(raw) {
     return {
-        indexAll: readRawBigint(raw, 'indexAll', 0),
-        user: readRawString(raw, 'user', 1),
-        index: readRawBigint(raw, 'index', 2),
-        tokenAddress: readRawString(raw, 'tokenAddr', 3),
-        poolAddress: readRawString(raw, 'poolAddr', 4),
-        vestingAddress: readRawString(raw, 'vestingAddr', 5),
-        quoteTokenAddr: readRawString(raw, 'quoteTokenAddr', 6),
-        initialSupply: readRawBigint(raw, 'initialSupply', 7),
-        initialLP: readRawBigint(raw, 'initialLP', 8),
-        initialQuote: readRawBigint(raw, 'initialQuote', 9),
-        lpAddRate: readRawBigint(raw, 'lpAddRate', 10),
-        buybackRate: readRawBigint(raw, 'buybackRate', 11),
-        buybackPath: readRawStringArray(raw, 'buybackPath', 12),
-        marketingRates: readRawBigintArray(raw, 'marketingRates', 13),
-        marketingAddrs: readRawStringArray(raw, 'marketingAddrs', 14),
-        vestingAmount: readRawBigint(raw, 'vestingAmount', 15),
-        vestingLockEndTime: readRawBigint(raw, 'vestingLockEndTime', 16),
-        vestingReleaseEndTime: readRawBigint(raw, 'vestingReleaseEndTime', 17),
-        vestingRecipients: readRawStringArray(raw, 'vestingRecipients', 18),
-        vestingRatios: readRawBigintArray(raw, 'vestingRatios', 19),
-        tradeStartTime: readRawBigint(raw, 'tradeStartTime', 20),
-        claimStartTime: readRawBigint(raw, 'claimStartTime', 21),
-        claimEndTime: readRawBigint(raw, 'claimEndTime', 22),
-        lockTime: readRawBigint(raw, 'lockTime', 23),
-        releasePeriod: readRawBigint(raw, 'releasePeriod', 24),
-        maxCount: readRawBigint(raw, 'maxCount', 25),
-        minAmount: readRawBigint(raw, 'minAmount', 26),
-        maxAmount: readRawBigint(raw, 'maxAmount', 27),
-        name: readRawString(raw, 'name', 28),
-        symbol: readRawString(raw, 'symbol', 29),
-        logo: readRawString(raw, 'logo', 30),
-        metadata: readRawString(raw, 'metadata', 31),
-        timestamp: readRawBigint(raw, 'timestamp', 32),
+        indexAll: BigInt(raw.indexAll ?? raw[0] ?? 0),
+        user: raw.user ?? raw[1] ?? '',
+        index: BigInt(raw.index ?? raw[2] ?? 0),
+        tokenAddress: raw.tokenAddr ?? raw[3] ?? '',
+        poolAddress: raw.poolAddr ?? raw[4] ?? '',
+        vestingAddress: raw.vestingAddr ?? raw[5] ?? '',
+        quoteTokenAddr: raw.quoteTokenAddr ?? raw[6] ?? '',
+        initialSupply: BigInt(raw.initialSupply ?? raw[7] ?? 0),
+        initialLP: BigInt(raw.initialLP ?? raw[8] ?? 0),
+        initialQuote: BigInt(raw.initialQuote ?? raw[9] ?? 0),
+        lpAddRate: BigInt(raw.lpAddRate ?? raw[10] ?? 0),
+        buybackRate: BigInt(raw.buybackRate ?? raw[11] ?? 0),
+        buybackPath: Array.from(raw.buybackPath ?? raw[12] ?? []),
+        marketingRates: (raw.marketingRates ?? raw[13] ?? []).map((r) => BigInt(r)),
+        marketingAddrs: Array.from(raw.marketingAddrs ?? raw[14] ?? []),
+        vestingAmount: BigInt(raw.vestingAmount ?? raw[15] ?? 0),
+        vestingLockEndTime: BigInt(raw.vestingLockEndTime ?? raw[16] ?? 0),
+        vestingReleaseEndTime: BigInt(raw.vestingReleaseEndTime ?? raw[17] ?? 0),
+        vestingRecipients: Array.from(raw.vestingRecipients ?? raw[18] ?? []),
+        vestingRatios: (raw.vestingRatios ?? raw[19] ?? []).map((r) => BigInt(r)),
+        tradeStartTime: BigInt(raw.tradeStartTime ?? raw[20] ?? 0),
+        claimStartTime: BigInt(raw.claimStartTime ?? raw[21] ?? 0),
+        claimEndTime: BigInt(raw.claimEndTime ?? raw[22] ?? 0),
+        lockTime: BigInt(raw.lockTime ?? raw[23] ?? 0),
+        releasePeriod: BigInt(raw.releasePeriod ?? raw[24] ?? 0),
+        maxCount: BigInt(raw.maxCount ?? raw[25] ?? 0),
+        minAmount: BigInt(raw.minAmount ?? raw[26] ?? 0),
+        maxAmount: BigInt(raw.maxAmount ?? raw[27] ?? 0),
+        name: raw.name ?? raw[28] ?? '',
+        symbol: raw.symbol ?? raw[29] ?? '',
+        logo: raw.logo ?? raw[30] ?? '',
+        metadata: raw.metadata ?? raw[31] ?? '',
+        timestamp: BigInt(raw.timestamp ?? raw[32] ?? 0),
     };
 }

package/dist/chains/eni/platforms/fair-launch/pool.js

@@ -7,7 +7,7 @@
  * - 构建跟买交易 (claimForSubmit / batchClaimForSubmit)
  */
 import { Contract, Interface, Wallet, JsonRpcProvider } from 'ethers';
-import { ENI_CHAIN_ID, ENI_RPC_URL, LP_FAIR_POOL_ABI, NATIVE_TRANSFER_GAS_LIMIT } from '../../constants.js';
+import { ENI_CHAIN_ID, ENI_RPC_URL, LP_FAIR_POOL_ABI, NATIVE_TRANSFER_GAS_LIMIT, } from '../../constants.js';
 import { buildProfitTransfer } from '../daoaas/portal-direct.js';
 import { calculateProfitAmount, getProfitRateBps, getProfitRecipient } from '../../../../shared/constants/profit.js';
 const poolIface = new Interface(LP_FAIR_POOL_ABI);
@@ -15,9 +15,6 @@ const poolIface = new Interface(LP_FAIR_POOL_ABI);
 // 查询
 // ============================================================================
 export class FairPoolQuery {
-    provider;
-    pool;
-    poolAddress;
     constructor(poolAddress, rpcUrl) {
         this.poolAddress = poolAddress;
         this.provider = new JsonRpcProvider(rpcUrl ?? ENI_RPC_URL, ENI_CHAIN_ID, { staticNetwork: true });