four-flap-meme-sdk 1.7.16 → 1.7.18

package/dist/eip7702/xlayer/bundle-approve.js

@@ -48,7 +48,7 @@ export async function bundleApprove(params) {
         throw new Error('privateKeys 不能为空');
     }
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const mainWallet = createWallet(mainPrivateKey, provider);
     const wallets = privateKeys.map(pk => createWallet(pk, provider));
     // 检查 mainWallet 是否在 wallets 中

package/dist/eip7702/xlayer/bundle-buy.js

@@ -182,7 +182,7 @@ export async function bundleBuy(params) {
         throw new Error('privateKeys 和 buyAmounts 长度必须相同');
     }
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const actualRouter = routerAddress ?? getDefaultRouter(tradeType);
     // ========================================
     // 同步操作 - 批量创建钱包和解析金额

package/dist/eip7702/xlayer/bundle-create.js

@@ -130,7 +130,7 @@ export async function bundleCreateBuy(params) {
         throw new Error('buyerPrivateKeys 和 buyAmounts 长度必须相同');
     }
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
     // 创建钱包
     const devWallet = createWallet(devPrivateKey, provider);
@@ -280,7 +280,7 @@ export async function bundleCreateToDex(params) {
         throw new Error('dexBuyerPrivateKeys 和 dexBuyAmounts 长度必须相同');
     }
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
     // 创建钱包
     const payerWallet = createWallet(payerPrivateKey, provider);
@@ -428,7 +428,7 @@ export async function bundleCreateToDex(params) {
 export async function bundleGraduateBuy(params) {
     const { tokenAddress, privateKeys, payerPrivateKey, amountMode, totalBuyAmount, minAmount, maxAmount, walletAmounts, enableDexBuy = false, extensionData = '0x', curveAddresses, dexAddresses, graduationAmount, config, } = params;
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new Interface(UNIFIED_DELEGATE_ABI);
     // 创建钱包
     const payerWallet = createWallet(payerPrivateKey, provider);

package/dist/eip7702/xlayer/bundle-sell.js

@@ -193,7 +193,7 @@ function buildSellCalls(wallets, sellAmounts, tokenAddress, tradeType, routerAdd
 export async function bundleSell(params) {
     const { mainPrivateKey, privateKeys, sellAmounts, sellPercent, tokenAddress, tokenDecimals = 18, tradeType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, config, } = params;
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const actualRouter = routerAddress ?? getDefaultRouter(tradeType);
     // ========================================
     // 同步操作 - 批量创建钱包

package/dist/eip7702/xlayer/bundle-swap.js

@@ -189,7 +189,7 @@ export async function bundleSwap(params) {
     const { sellerPrivateKey, buyerPrivateKey, tokenAddress, tokenDecimals = 18, sellAmount, hopCount = 2, // ✅ 设为 0 则不多跳，直接 seller → buyer
     tradeType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, config, } = params;
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const actualRouter = routerAddress ?? getDefaultRouter(tradeType);
     // ========================================
     // 同步操作 - 创建钱包
@@ -266,7 +266,7 @@ export async function bundleBatchSwap(params) {
     const { sellerPrivateKey, buyerPrivateKeys, tokenAddress, tokenDecimals = 18, sellAmount, hopCount = 2, // ✅ 设为 0 则不多跳
     tradeType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, config, } = params;
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const actualRouter = routerAddress ?? getDefaultRouter(tradeType);
     // ========================================
     // 同步操作 - 创建钱包

package/dist/eip7702/xlayer/multi-hop-transfer.js

@@ -58,7 +58,7 @@ export async function disperse(params) {
         throw new Error('recipients 和 amounts 长度必须相同');
     }
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const mainWallet = createWallet(mainPrivateKey, provider);
     const isNative = !tokenAddress;
@@ -259,7 +259,7 @@ export async function disperse(params) {
 export async function sweep(params) {
     const { targetAddress, sourcePrivateKeys, payerPrivateKey, tokenAddress, tokenDecimals = 18, hopCount = 0, reserveGas = true, percent = 100, config, } = params;
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const sourceWallets = sourcePrivateKeys.map(pk => createWallet(pk, provider));
     const isNative = !tokenAddress;
@@ -520,7 +520,7 @@ export async function pairwiseTransfer(params) {
         throw new Error('必须提供 amount 或 amounts');
     })();
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const isNative = !tokenAddress;
     // 创建钱包

package/dist/eip7702/xlayer/utils.js

@@ -196,11 +196,12 @@ export async function buildEIP7702Transaction(mainWallet, authorizations, calls,
     const txHash = ethers.keccak256(toSign);
     const signingKey = new ethers.SigningKey(mainWallet.privateKey);
     const sig = signingKey.sign(txHash);
+    // ✅ 交易签名的 r/s 也需要去除前导零，符合 RLP 规范
     const signedTxData = [
         ...txData,
         bigintToBytes(BigInt(sig.yParity)),
-        ethers.getBytes(sig.r),
-        ethers.getBytes(sig.s),
+        trimLeadingZeros(ethers.getBytes(sig.r)),
+        trimLeadingZeros(ethers.getBytes(sig.s)),
     ];
     const signedRlp = rlp.encode(signedTxData);
     const signedTx = new Uint8Array(1 + signedRlp.length);
@@ -252,11 +253,12 @@ export function buildEIP7702TransactionSync(mainWallet, authorizations, calls, t
     const txHash = ethers.keccak256(toSign);
     const signingKey = new ethers.SigningKey(mainWallet.privateKey);
     const sig = signingKey.sign(txHash);
+    // ✅ 交易签名的 r/s 也需要去除前导零，符合 RLP 规范
     const signedTxData = [
         ...txData,
         bigintToBytes(BigInt(sig.yParity)),
-        ethers.getBytes(sig.r),
-        ethers.getBytes(sig.s),
+        trimLeadingZeros(ethers.getBytes(sig.r)),
+        trimLeadingZeros(ethers.getBytes(sig.s)),
     ];
     const signedRlp = rlp.encode(signedTxData);
     const signedTx = new Uint8Array(1 + signedRlp.length);

package/dist/eip7702/xlayer/volume.js

@@ -42,14 +42,28 @@ export async function washVolume(params) {
     if (privateKeys.length === 0) {
         throw new Error('至少需要一个钱包');
     }
+    // ✅ 验证私钥格式
+    const validPrivateKeys = privateKeys.filter(pk => {
+        const trimmed = (pk || '').trim();
+        return trimmed.length >= 64 && (trimmed.startsWith('0x') || /^[0-9a-fA-F]{64}$/.test(trimmed));
+    });
+    if (validPrivateKeys.length === 0) {
+        throw new Error('没有有效的私钥（私钥必须是 0x 开头的 66 位或 64 位十六进制字符串）');
+    }
+    if (validPrivateKeys.length !== privateKeys.length) {
+        console.warn(`[washVolume] 跳过 ${privateKeys.length - validPrivateKeys.length} 个无效私钥`);
+    }
+    // 使用验证后的私钥
+    const actualPrivateKeys = validPrivateKeys;
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    // ✅ 空字符串也使用默认值
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
     // 获取实际路由地址
     const actualRouter = routerAddress ?? getDefaultRouter(poolType);
-    // 创建钱包
-    const wallets = privateKeys.map(pk => createWallet(pk, provider));
+    // 创建钱包（使用验证后的私钥）
+    const wallets = actualPrivateKeys.map(pk => createWallet(pk, provider));
     const mainWallet = wallets[0];
     // 计算金额
     const buyAmountWei = ethers.parseEther(buyAmountPerWallet);
@@ -131,25 +145,50 @@ export async function washVolume(params) {
  */
 export async function bundleVolume(params) {
     const { buyerPrivateKeys, buyAmounts, sellerPrivateKeys, sellAmounts, sellPercent = 100, tokenAddress, tokenDecimals = 18, poolType = 'V3', routerAddress, fee = V3_FEE_TIERS.MEDIUM, config, } = params;
-    if (buyerPrivateKeys.length !== buyAmounts.length) {
-        throw new Error('buyerPrivateKeys 和 buyAmounts 长度必须相同');
+    // ✅ 验证私钥格式的辅助函数
+    const isValidPrivateKey = (pk) => {
+        const trimmed = (pk || '').trim();
+        return trimmed.length >= 64 && (trimmed.startsWith('0x') || /^[0-9a-fA-F]{64}$/.test(trimmed));
+    };
+    // ✅ 验证买家私钥
+    const validBuyerIndices = [];
+    const validBuyerPrivateKeys = [];
+    const validBuyAmounts = [];
+    buyerPrivateKeys.forEach((pk, i) => {
+        if (isValidPrivateKey(pk)) {
+            validBuyerIndices.push(i);
+            validBuyerPrivateKeys.push(pk);
+            validBuyAmounts.push(buyAmounts[i] || '0');
+        }
+    });
+    if (validBuyerPrivateKeys.length === 0) {
+        throw new Error('没有有效的买家私钥');
+    }
+    // ✅ 验证卖家私钥
+    const validSellerPrivateKeys = sellerPrivateKeys.filter(pk => isValidPrivateKey(pk));
+    if (validSellerPrivateKeys.length === 0) {
+        throw new Error('没有有效的卖家私钥');
+    }
+    if (validBuyerPrivateKeys.length !== buyerPrivateKeys.length || validSellerPrivateKeys.length !== sellerPrivateKeys.length) {
+        console.warn(`[bundleVolume] 跳过无效私钥: 买家 ${buyerPrivateKeys.length - validBuyerPrivateKeys.length} 个, 卖家 ${sellerPrivateKeys.length - validSellerPrivateKeys.length} 个`);
     }
     const provider = getCachedProvider(config?.rpcUrl);
-    const delegateAddress = config?.delegateAddress ?? UNIFIED_DELEGATE_ADDRESS;
+    // ✅ 空字符串也使用默认值
+    const delegateAddress = (config?.delegateAddress && config.delegateAddress.trim()) || UNIFIED_DELEGATE_ADDRESS;
     const delegateInterface = new ethers.Interface(UNIFIED_DELEGATE_ABI);
     const portalInterface = new ethers.Interface(FLAP_PORTAL_ABI);
     const actualRouter = routerAddress ?? getDefaultRouter(poolType);
-    // 创建钱包
-    const buyerWallets = buyerPrivateKeys.map(pk => createWallet(pk, provider));
-    const sellerWallets = sellerPrivateKeys.map(pk => createWallet(pk, provider));
+    // 创建钱包（使用验证后的私钥）
+    const buyerWallets = validBuyerPrivateKeys.map(pk => createWallet(pk, provider));
+    const sellerWallets = validSellerPrivateKeys.map(pk => createWallet(pk, provider));
     // 合并所有钱包（去重）
     const allWalletsMap = new Map();
     buyerWallets.forEach(w => allWalletsMap.set(w.address.toLowerCase(), w));
     sellerWallets.forEach(w => allWalletsMap.set(w.address.toLowerCase(), w));
     const allWallets = Array.from(allWalletsMap.values());
     const mainWallet = allWallets[0];
-    // 计算买入金额
-    const buyAmountsWei = buyAmounts.map(amt => ethers.parseEther(amt));
+    // 计算买入金额（使用验证后的金额数组）
+    const buyAmountsWei = validBuyAmounts.map(amt => ethers.parseEther(amt));
     const totalBuyAmount = buyAmountsWei.reduce((sum, amt) => sum + amt, 0n);
     // 计算利润
     const profitAmount = calculateProfitAmount(totalBuyAmount);

package/package.json

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