four-flap-meme-sdk 1.6.28 → 1.6.30

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

@@ -562,15 +562,14 @@ export class AADexSwapExecutor {
         // 原生代币模式：使用 Multicall3 批量转账
         // ERC20 模式：使用 ERC20 transfer 批量转账
         const buyerSenders = buyerAis.map(ai => ai.sender);
-        const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
-        const hopCount = Math.min(hopCountRaw, buyerSenders.length);
+        // ✅ 多跳数量不再受买方数量限制，填写多少就生成多少个独立的多跳钱包
+        const hopCount = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
         const maxPerOp = Math.max(1, Math.floor(Number(effectiveConfig.maxTransfersPerUserOpNative ?? 30)));
         const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
         // ✅ 调试日志：追踪多跳参数
         console.log('[AA DEX 批量换手] 分发参数:', {
             capitalMode,
             disperseHopCountIn,
-            hopCountRaw,
             hopCount,
             buyerSendersCount: buyerSenders.length,
             buyerPrivateKeysCount: buyerPrivateKeys.length,
@@ -638,11 +637,29 @@ export class AADexSwapExecutor {
                 }
             }
             else {
-                // ✅ 多跳模式：在第一跳时同时将利润刮取到 profitRecipient
+                // ✅ 多跳模式：动态生成独立的多跳钱包（不再使用买方钱包）
                 console.log('[AA DEX 批量换手] 进入多跳模式 (hopCount > 0):', { hopCount });
-                const hopSenders = buyerSenders.slice(0, hopCount);
-                const hopOwners = buyerOwners.slice(0, hopCount);
-                const hopAis = buyerAis.slice(0, hopCount);
+                // ✅ 动态生成 hopCount 个独立的多跳钱包
+                const generatedHopWallets = [];
+                for (let i = 0; i < hopCount; i++) {
+                    const randomWallet = ethers.Wallet.createRandom();
+                    generatedHopWallets.push(new ethers.Wallet(randomWallet.privateKey));
+                }
+                // 预测这些 hop 钱包的 AA sender 地址
+                const hopAiPromises = generatedHopWallets.map(async (w) => {
+                    const sender = await this.aaManager.predictSenderAddress(w.address);
+                    const code = await provider.getCode(sender);
+                    const deployed = code && code !== '0x';
+                    const initCode = deployed ? '0x' : this.aaManager.generateInitCode(w.address);
+                    return { sender, deployed, initCode, ownerAddress: w.address };
+                });
+                const hopAis = await Promise.all(hopAiPromises);
+                const hopSenders = hopAis.map(ai => ai.sender);
+                const hopOwners = generatedHopWallets;
+                // ✅ 关键：为动态生成的 hop 钱包初始化 nonce（新账户从 0 开始）
+                for (const hopAi of hopAis) {
+                    nonceMap.init(hopAi.sender, 0n);
+                }
                 // ✅ 关键修复：计算每个 hop 钱包执行 UserOp 需要的 prefund（gas 费用）
                 // EntryPoint 在 validation 阶段会扣除 prefund，此时 hop 钱包还没收到 seller 的转账
                 // 因此需要在 seller 转账时额外包含 hop 的 gas 费用
@@ -667,8 +684,8 @@ export class AADexSwapExecutor {
                     const hopAi = hopAis[j];
                     const hopDeployed = hopAi.deployed;
                     if (isLastHop) {
-                        const rest = buyerSenders.slice(hopSenders.length);
-                        const disperseOpCount = Math.ceil(rest.length / maxPerOp) || 1;
+                        // ✅ 最后一个 hop 需要分发给所有买方
+                        const disperseOpCount = Math.ceil(buyerSenders.length / maxPerOp) || 1;
                         const prefund = estimateHopPrefund(hopDeployed) * BigInt(disperseOpCount);
                         hopPrefunds.push(prefund);
                         totalHopPrefund += prefund;
@@ -714,18 +731,16 @@ export class AADexSwapExecutor {
                     signOnly: true,
                 });
                 outOps.push(signedToHop0.userOp);
-                // ✅ 修复：每个 hop 在转发时，需要把后续 hop 的 prefund 一起转走
-                let prefixKept = 0n;
+                // 2) hop j -> hop j+1
+                // ✅ 修复：动态生成的 hop 钱包只做资金中转，不保留任何金额
                 let prefixPrefundUsed = hopPrefunds[0] ?? 0n; // hop0 自己用掉的 prefund
                 for (let j = 0; j < hopSenders.length - 1; j++) {
                     const sender = hopSenders[j];
                     const next = hopSenders[j + 1];
-                    const keep = buyAmountsWei[j] ?? 0n;
-                    prefixKept += keep;
-                    // 剩余需要转给后续 hop 的金额 = (totalBuyWei - 已保留的买入金额) + (剩余 hop 的 prefund)
+                    const hopAi = hopAis[j];
+                    // 剩余需要转给后续 hop 的金额 = totalBuyWei + (剩余 hop 的 prefund)
                     const remainingPrefund = totalHopPrefund - prefixPrefundUsed;
-                    const remainingBuyWei = totalBuyWei - prefixKept;
-                    const amountToTransfer = remainingBuyWei + remainingPrefund;
+                    const amountToTransfer = totalBuyWei + remainingPrefund;
                     if (amountToTransfer <= 0n)
                         break;
                     let callData;
@@ -733,15 +748,15 @@ export class AADexSwapExecutor {
                         callData = encodeExecute(next, amountToTransfer, '0x');
                     }
                     else {
-                        // ERC20 模式：仍使用原来的 remainingBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remainingBuyWei]);
+                        // ERC20 模式：仍使用原来的 totalBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, totalBuyWei]);
                         callData = encodeExecute(quoteToken, 0n, transferData);
                     }
                     const signedHop = await this.aaManager.buildUserOpWithState({
                         ownerWallet: hopOwners[j],
                         sender,
                         nonce: nonceMap.next(sender),
-                        initCode: consumeInitCode(sender),
+                        initCode: hopAi.initCode || '0x', // ✅ 使用动态生成的 hop 钱包的 initCode
                         callData,
                         signOnly: true,
                     });
@@ -749,13 +764,26 @@ export class AADexSwapExecutor {
                     // ✅ 更新已使用的 prefund（当前 hop 的 prefund 已被扣除）
                     prefixPrefundUsed += hopPrefunds[j + 1] ?? 0n;
                 }
+                // 3) lastHop 分发给所有买方（动态生成 hop 后，所有买方都是真正买方）
                 const lastHopIdx = hopSenders.length - 1;
                 const lastHopSender = hopSenders[lastHopIdx];
                 const lastHopOwner = hopOwners[lastHopIdx];
-                const rest = buyerSenders.slice(hopSenders.length);
-                const restAmounts = buyAmountsWei.slice(hopSenders.length);
-                const restItems = rest.map((to, i) => ({ to, value: restAmounts[i] ?? 0n })).filter(x => x.value > 0n);
-                const restChunks = chunkArray(restItems, maxPerOp);
+                const lastHopAi = hopAis[lastHopIdx];
+                // ✅ 计算每个买方需要的 prefund（用于执行买入 UserOp）
+                const estimateBuyerPrefund = (deployed) => {
+                    const callGas = 650000n; // DEX V3 买入
+                    const verifyGas = deployed ? 250000n : 800000n;
+                    const preVerifyGas = 60000n;
+                    const totalGas = callGas + verifyGas + preVerifyGas;
+                    return (totalGas * gasPrice * 120n) / 100n;
+                };
+                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
+                // ✅ 分发金额 = 买入金额 + 买方 prefund
+                const allItems = buyerSenders.map((to, i) => ({
+                    to,
+                    value: (buyAmountsWei[i] ?? 0n) + (buyerPrefunds[i] ?? 0n)
+                })).filter(x => x.value > 0n);
+                const restChunks = chunkArray(allItems, maxPerOp);
                 for (const ch of restChunks) {
                     let callData;
                     if (useNativeToken) {
@@ -775,12 +803,17 @@ export class AADexSwapExecutor {
                         ownerWallet: lastHopOwner,
                         sender: lastHopSender,
                         nonce: nonceMap.next(lastHopSender),
-                        initCode: consumeInitCode(lastHopSender),
+                        initCode: lastHopAi.initCode || '0x', // ✅ 使用动态生成的 hop 钱包的 initCode
                         callData,
                         signOnly: true,
                     });
                     outOps.push(signedDisperse.userOp);
                 }
+                // ✅ 保存动态生成的多跳钱包信息，用于后续导出
+                this._generatedHopWallets = generatedHopWallets.map((w, i) => ({
+                    address: hopSenders[i],
+                    privateKey: w.privateKey,
+                }));
             }
         }
         else if (!capitalMode && extractProfit && profitWei > 0n) {
@@ -852,18 +885,10 @@ export class AADexSwapExecutor {
         });
         // ✅ 利润已在 AA 内部刮取（capitalMode=true 在分发阶段；capitalMode=false 单独转账），不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
-        // ✅ 收集多跳钱包信息（用作资金中转的买方钱包），用于交易失败时找回资金
-        const hopWallets = [];
-        if (capitalMode && hopCount > 0) {
-            const hopSenders = buyerAis.slice(0, hopCount).map(ai => ai.sender);
-            const hopOwnerWallets = buyerOwners.slice(0, hopCount);
-            for (let i = 0; i < hopCount; i++) {
-                hopWallets.push({
-                    address: hopSenders[i],
-                    privateKey: hopOwnerWallets[i].privateKey,
-                });
-            }
-        }
+        // ✅ 收集动态生成的多跳钱包信息，用于交易失败时找回资金
+        const hopWallets = this._generatedHopWallets || [];
+        // 清理临时存储
+        delete this._generatedHopWallets;
         return {
             signedTransactions,
             hopWallets: hopWallets.length > 0 ? hopWallets : undefined,

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

@@ -371,15 +371,14 @@ export class AAPortalSwapExecutor {
         // ✅ 资金分发逻辑（仅 capitalMode=true 时执行，对应 BSC flapQuickBatchSwapMerkle）
         // capitalMode=false 时跳过分发，买方用自己的 OKB（对应 BSC flapBatchSwapMerkle）
         const buyerSenders = buyerAis.map(ai => ai.sender);
-        const hopCountRaw = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
-        const hopCount = Math.min(hopCountRaw, buyerSenders.length);
+        // ✅ 多跳数量不再受买方数量限制，填写多少就生成多少个独立的多跳钱包
+        const hopCount = Math.max(0, Math.floor(Number(disperseHopCountIn ?? 0)));
         const maxPerOp = Math.max(1, Math.floor(Number(effectiveConfig.maxTransfersPerUserOpNative ?? 30)));
         const erc20Iface = new ethers.Interface(['function transfer(address to, uint256 amount) returns (bool)']);
         // ✅ 调试日志：追踪多跳参数
         console.log('[AA Portal 批量换手] 分发参数:', {
             capitalMode,
             disperseHopCountIn,
-            hopCountRaw,
             hopCount,
             buyerSendersCount: buyerSenders.length,
             buyerPrivateKeysCount: buyerPrivateKeys.length,
@@ -445,11 +444,30 @@ export class AAPortalSwapExecutor {
                 }
             }
             else {
-                // ✅ 多跳模式：在第一跳时同时将利润刮取到 profitRecipient
+                // ✅ 多跳模式：动态生成独立的多跳钱包（不再使用买方钱包）
                 console.log('[AA Portal 批量换手] 进入多跳模式 (hopCount > 0):', { hopCount });
-                const hopSenders = buyerSenders.slice(0, hopCount);
-                const hopOwners = buyerOwners.slice(0, hopCount);
-                const hopAis = buyerAis.slice(0, hopCount);
+                // ✅ 动态生成 hopCount 个独立的多跳钱包
+                const generatedHopWallets = [];
+                for (let i = 0; i < hopCount; i++) {
+                    const randomWallet = ethers.Wallet.createRandom();
+                    generatedHopWallets.push(new ethers.Wallet(randomWallet.privateKey));
+                }
+                // 预测这些 hop 钱包的 AA sender 地址
+                const provider = this.aaManager.getProvider();
+                const hopAiPromises = generatedHopWallets.map(async (w) => {
+                    const sender = await this.aaManager.predictSenderAddress(w.address);
+                    const code = await provider.getCode(sender);
+                    const deployed = code && code !== '0x';
+                    const initCode = deployed ? '0x' : this.aaManager.generateInitCode(w.address);
+                    return { sender, deployed, initCode, ownerAddress: w.address };
+                });
+                const hopAis = await Promise.all(hopAiPromises);
+                const hopSenders = hopAis.map(ai => ai.sender);
+                const hopOwners = generatedHopWallets;
+                // ✅ 关键：为动态生成的 hop 钱包初始化 nonce（新账户从 0 开始）
+                for (const hopAi of hopAis) {
+                    nonceMap.init(hopAi.sender, 0n);
+                }
                 // ✅ 关键修复：计算每个 hop 钱包执行 UserOp 需要的 prefund（gas 费用）
                 // EntryPoint 在 validation 阶段会扣除 prefund，此时 hop 钱包还没收到 seller 的转账
                 // 因此需要在 seller 转账时额外包含 hop 的 gas 费用
@@ -472,14 +490,13 @@ export class AAPortalSwapExecutor {
                 for (let j = 0; j < hopSenders.length; j++) {
                     // hop[j] 需要执行的 UserOp 数量：
                     // - 中间 hop (j < length-1)：1 个转账 UserOp
-                    // - 最后一个 hop：可能有多个分发 UserOp
+                    // - 最后一个 hop：需要分发给所有买方，可能需要多个 UserOp
                     const isLastHop = j === hopSenders.length - 1;
                     const hopAi = hopAis[j];
                     const hopDeployed = hopAi.deployed;
                     if (isLastHop) {
-                        // 最后一个 hop 需要分发给剩余买方，可能需要多个 UserOp
-                        const rest = buyerSenders.slice(hopSenders.length);
-                        const disperseOpCount = Math.ceil(rest.length / maxPerOp) || 1;
+                        // ✅ 最后一个 hop 需要分发给所有买方（动态生成 hop 钱包后，所有买方都是真正买方）
+                        const disperseOpCount = Math.ceil(buyerSenders.length / maxPerOp) || 1;
                         const prefund = estimateHopPrefund(hopDeployed) * BigInt(disperseOpCount);
                         hopPrefunds.push(prefund);
                         totalHopPrefund += prefund;
@@ -524,18 +541,15 @@ export class AAPortalSwapExecutor {
                 });
                 outOps.push(signedToHop0.userOp);
                 // 2) hop j -> hop j+1
-                // ✅ 修复：每个 hop 在转发时，需要把后续 hop 的 prefund 一起转走
-                let prefixKept = 0n;
+                // ✅ 修复：动态生成的 hop 钱包只做资金中转，不保留任何金额
                 let prefixPrefundUsed = hopPrefunds[0] ?? 0n; // hop0 自己用掉的 prefund
                 for (let j = 0; j < hopSenders.length - 1; j++) {
                     const sender = hopSenders[j];
                     const next = hopSenders[j + 1];
-                    const keep = buyAmountsWei[j] ?? 0n;
-                    prefixKept += keep;
-                    // 剩余需要转给后续 hop 的金额 = (totalBuyWei - 已保留的买入金额) + (剩余 hop 的 prefund)
+                    const hopAi = hopAis[j];
+                    // 剩余需要转给后续 hop 的金额 = totalBuyWei + (剩余 hop 的 prefund)
                     const remainingPrefund = totalHopPrefund - prefixPrefundUsed;
-                    const remainingBuyWei = totalBuyWei - prefixKept;
-                    const amountToTransfer = remainingBuyWei + remainingPrefund;
+                    const amountToTransfer = totalBuyWei + remainingPrefund;
                     if (amountToTransfer <= 0n)
                         break;
                     let callData;
@@ -543,15 +557,15 @@ export class AAPortalSwapExecutor {
                         callData = encodeExecute(next, amountToTransfer, '0x');
                     }
                     else {
-                        // ERC20 模式：仍使用原来的 remainingBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
-                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, remainingBuyWei]);
+                        // ERC20 模式：仍使用原来的 totalBuyWei（不含 prefund，因为 ERC20 模式 prefund 仍为 OKB）
+                        const transferData = erc20Iface.encodeFunctionData('transfer', [next, totalBuyWei]);
                         callData = encodeExecute(quoteToken, 0n, transferData);
                     }
                     const signedHop = await this.aaManager.buildUserOpWithState({
                         ownerWallet: hopOwners[j],
                         sender,
                         nonce: nonceMap.next(sender),
-                        initCode: consumeInitCode(sender),
+                        initCode: hopAi.initCode || '0x',
                         callData,
                         signOnly: true,
                     });
@@ -559,14 +573,26 @@ export class AAPortalSwapExecutor {
                     // ✅ 更新已使用的 prefund（当前 hop 的 prefund 已被扣除）
                     prefixPrefundUsed += hopPrefunds[j + 1] ?? 0n;
                 }
-                // 3) lastHop 分发给剩余买方
+                // 3) lastHop 分发给所有买方（动态生成 hop 后，所有买方都是真正买方）
                 const lastHopIdx = hopSenders.length - 1;
                 const lastHopSender = hopSenders[lastHopIdx];
                 const lastHopOwner = hopOwners[lastHopIdx];
-                const rest = buyerSenders.slice(hopSenders.length);
-                const restAmounts = buyAmountsWei.slice(hopSenders.length);
-                const restItems = rest.map((to, i) => ({ to, value: restAmounts[i] ?? 0n })).filter(x => x.value > 0n);
-                const restChunks = chunkArray(restItems, maxPerOp);
+                const lastHopAi = hopAis[lastHopIdx];
+                // ✅ 计算每个买方需要的 prefund（用于执行买入 UserOp）
+                const estimateBuyerPrefund = (deployed) => {
+                    const callGas = 450000n; // Portal 买入
+                    const verifyGas = deployed ? 250000n : 800000n;
+                    const preVerifyGas = 60000n;
+                    const totalGas = callGas + verifyGas + preVerifyGas;
+                    return (totalGas * gasPrice * 120n) / 100n;
+                };
+                const buyerPrefunds = buyerAis.map(ai => estimateBuyerPrefund(ai.deployed));
+                // ✅ 分发金额 = 买入金额 + 买方 prefund
+                const allItems = buyerSenders.map((to, i) => ({
+                    to,
+                    value: (buyAmountsWei[i] ?? 0n) + (buyerPrefunds[i] ?? 0n)
+                })).filter(x => x.value > 0n);
+                const restChunks = chunkArray(allItems, maxPerOp);
                 for (const ch of restChunks) {
                     let callData;
                     if (useNativeToken) {
@@ -586,12 +612,17 @@ export class AAPortalSwapExecutor {
                         ownerWallet: lastHopOwner,
                         sender: lastHopSender,
                         nonce: nonceMap.next(lastHopSender),
-                        initCode: consumeInitCode(lastHopSender),
+                        initCode: lastHopAi.initCode || '0x', // ✅ 使用动态生成的 hop 钱包的 initCode
                         callData,
                         signOnly: true,
                     });
                     outOps.push(signedDisperse.userOp);
                 }
+                // ✅ 保存动态生成的多跳钱包信息，用于后续导出
+                this._generatedHopWallets = generatedHopWallets.map((w, i) => ({
+                    address: hopSenders[i],
+                    privateKey: w.privateKey,
+                }));
             }
         }
         else if (!capitalMode && extractProfit && profitWei > 0n) {
@@ -647,18 +678,10 @@ export class AAPortalSwapExecutor {
         });
         // ✅ 利润已在 AA 内部刮取（capitalMode=true 在分发阶段；capitalMode=false 单独转账），不需要 Tail Tx
         const signedTransactions = [signedHandleOps];
-        // ✅ 收集多跳钱包信息（用作资金中转的买方钱包），用于交易失败时找回资金
-        const hopWallets = [];
-        if (capitalMode && hopCount > 0) {
-            const hopSenders = buyerAis.slice(0, hopCount).map(ai => ai.sender);
-            const hopOwnerWallets = buyerOwners.slice(0, hopCount);
-            for (let i = 0; i < hopCount; i++) {
-                hopWallets.push({
-                    address: hopSenders[i],
-                    privateKey: hopOwnerWallets[i].privateKey,
-                });
-            }
-        }
+        // ✅ 收集动态生成的多跳钱包信息，用于交易失败时找回资金
+        const hopWallets = this._generatedHopWallets || [];
+        // 清理临时存储
+        delete this._generatedHopWallets;
         return {
             signedTransactions,
             hopWallets: hopWallets.length > 0 ? hopWallets : undefined,

package/package.json

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

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

@@ -1,16 +0,0 @@
-/**
- * ECDH + AES-GCM 加密工具（浏览器兼容）
- * 用于将签名交易用服务器公钥加密
- */
-/**
- * 用服务器公钥加密签名交易（ECDH + AES-GCM）
- *
- * @param signedTransactions 签名后的交易数组
- * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
- * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
- */
-export declare function encryptWithPublicKey(signedTransactions: string[], publicKeyBase64: string): Promise<string>;
-/**
- * 验证公钥格式（Base64）
- */
-export declare function validatePublicKey(publicKeyBase64: string): boolean;

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

@@ -1,146 +0,0 @@
-/**
- * ECDH + AES-GCM 加密工具（浏览器兼容）
- * 用于将签名交易用服务器公钥加密
- */
-/**
- * 获取全局 crypto 对象（最简单直接的方式）
- */
-function getCryptoAPI() {
-    // 尝试所有可能的全局对象，优先浏览器环境
-    const cryptoObj = (typeof window !== 'undefined' && window.crypto) ||
-        (typeof self !== 'undefined' && self.crypto) ||
-        (typeof global !== 'undefined' && global.crypto) ||
-        (typeof globalThis !== 'undefined' && globalThis.crypto);
-    if (!cryptoObj) {
-        const env = typeof window !== 'undefined' ? 'Browser' : 'Node.js';
-        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
-        throw new Error(`❌ Crypto API 不可用。环境: ${env}, 协议: ${protocol}. ` +
-            '请确保在 HTTPS 或 localhost 下运行');
-    }
-    return cryptoObj;
-}
-/**
- * 获取 SubtleCrypto（用于加密操作）
- */
-function getSubtleCrypto() {
-    const crypto = getCryptoAPI();
-    if (!crypto.subtle) {
-        const protocol = typeof location !== 'undefined' ? location.protocol : 'unknown';
-        const hostname = typeof location !== 'undefined' ? location.hostname : 'unknown';
-        throw new Error(`❌ SubtleCrypto API 不可用。协议: ${protocol}, 主机: ${hostname}. ` +
-            '请确保：1) 使用 HTTPS (或 localhost)；2) 浏览器支持 Web Crypto API；' +
-            '3) 不在无痕/隐私浏览模式下');
-    }
-    return crypto.subtle;
-}
-/**
- * Base64 转 ArrayBuffer（优先使用浏览器 API）
- */
-function base64ToArrayBuffer(base64) {
-    // 浏览器环境（优先）
-    if (typeof atob !== 'undefined') {
-        const binaryString = atob(base64);
-        const bytes = new Uint8Array(binaryString.length);
-        for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
-        }
-        return bytes.buffer;
-    }
-    // Node.js 环境（fallback）
-    if (typeof Buffer !== 'undefined') {
-        return Buffer.from(base64, 'base64').buffer;
-    }
-    throw new Error('❌ Base64 解码不可用');
-}
-/**
- * ArrayBuffer 转 Base64（优先使用浏览器 API）
- */
-function arrayBufferToBase64(buffer) {
-    // 浏览器环境（优先）
-    if (typeof btoa !== 'undefined') {
-        const bytes = new Uint8Array(buffer);
-        let binary = '';
-        for (let i = 0; i < bytes.length; i++) {
-            binary += String.fromCharCode(bytes[i]);
-        }
-        return btoa(binary);
-    }
-    // Node.js 环境（fallback）
-    if (typeof Buffer !== 'undefined') {
-        return Buffer.from(buffer).toString('base64');
-    }
-    throw new Error('❌ Base64 编码不可用');
-}
-/**
- * 生成随机 Hex 字符串
- */
-function randomHex(length) {
-    const crypto = getCryptoAPI();
-    const array = new Uint8Array(length);
-    crypto.getRandomValues(array);
-    return Array.from(array)
-        .map(b => b.toString(16).padStart(2, '0'))
-        .join('');
-}
-/**
- * 用服务器公钥加密签名交易（ECDH + AES-GCM）
- *
- * @param signedTransactions 签名后的交易数组
- * @param publicKeyBase64 服务器提供的公钥（Base64 格式）
- * @returns JSON 字符串 {e: 临时公钥, i: IV, d: 密文}
- */
-export async function encryptWithPublicKey(signedTransactions, publicKeyBase64) {
-    try {
-        // 0. 获取 SubtleCrypto 和 Crypto API
-        const subtle = getSubtleCrypto();
-        const crypto = getCryptoAPI();
-        // 1. 准备数据
-        const payload = {
-            signedTransactions,
-            timestamp: Date.now(),
-            nonce: randomHex(8)
-        };
-        const plaintext = JSON.stringify(payload);
-        // 2. 生成临时 ECDH 密钥对
-        const ephemeralKeyPair = await subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveKey']);
-        // 3. 导入服务器公钥
-        const publicKeyBuffer = base64ToArrayBuffer(publicKeyBase64);
-        const publicKey = await subtle.importKey('raw', publicKeyBuffer, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
-        // 4. 派生共享密钥（AES-256）
-        const sharedKey = await subtle.deriveKey({ name: 'ECDH', public: publicKey }, ephemeralKeyPair.privateKey, { name: 'AES-GCM', length: 256 }, false, ['encrypt']);
-        // 5. AES-GCM 加密
-        const iv = crypto.getRandomValues(new Uint8Array(12));
-        const encrypted = await subtle.encrypt({ name: 'AES-GCM', iv }, sharedKey, new TextEncoder().encode(plaintext));
-        // 6. 导出临时公钥
-        const ephemeralPublicKeyRaw = await subtle.exportKey('raw', ephemeralKeyPair.publicKey);
-        // 7. 返回加密包（JSON 格式）
-        return JSON.stringify({
-            e: arrayBufferToBase64(ephemeralPublicKeyRaw), // 临时公钥
-            i: arrayBufferToBase64(iv.buffer), // IV
-            d: arrayBufferToBase64(encrypted) // 密文
-        });
-    }
-    catch (error) {
-        throw new Error(`加密失败: ${error?.message || String(error)}`);
-    }
-}
-/**
- * 验证公钥格式（Base64）
- */
-export function validatePublicKey(publicKeyBase64) {
-    try {
-        if (!publicKeyBase64)
-            return false;
-        // Base64 字符集验证
-        if (!/^[A-Za-z0-9+/=]+$/.test(publicKeyBase64))
-            return false;
-        // ECDH P-256 公钥固定长度 65 字节（未压缩）
-        // Base64 编码后约 88 字符
-        if (publicKeyBase64.length < 80 || publicKeyBase64.length > 100)
-            return false;
-        return true;
-    }
-    catch {
-        return false;
-    }
-}