four-flap-meme-sdk 1.7.9 → 1.7.11

package/dist/eip7702/xlayer/bundle.js

@@ -34,11 +34,12 @@ function hashAuthorization(chainId, executorAddress, nonce) {
 async function signAuthorization(wallet, nonce) {
     const messageHash = hashAuthorization(XLAYER_CHAIN_ID, EXECUTOR_ADDRESS, nonce);
     const signature = wallet.signingKey.sign(messageHash);
+    // 注意：EIP-7702 授权签名使用 yParity (0 或 1)，不是 v (27 或 28)
     return {
         chainId: XLAYER_CHAIN_ID,
         address: EXECUTOR_ADDRESS,
         nonce,
-        v: signature.v,
+        v: signature.yParity,
         r: signature.r,
         s: signature.s,
     };
@@ -207,10 +208,10 @@ export class XLayerBundle {
         ]);
         const txHash = ethers.keccak256(unsigned);
         const signature = sponsor.signingKey.sign(txHash);
-        // 添加签名
+        // 添加签名（注意：Type 4 交易使用 yParity (0 或 1)，不是 v (27 或 28)）
         const signedFields = [
             ...fields,
-            toRlpHex(signature.v),
+            toRlpHex(signature.yParity),
             signature.r,
             signature.s,
         ];

package/dist/eip7702/xlayer/create-to-dex.js

@@ -68,11 +68,12 @@ function hashAuthorization(chainId, executorAddress, nonce) {
 function signAuthorization(wallet, nonce = 0) {
     const messageHash = hashAuthorization(XLAYER_CHAIN_ID, EXECUTOR_ADDRESS, nonce);
     const signature = wallet.signingKey.sign(messageHash);
+    // 注意：EIP-7702 授权签名使用 yParity (0 或 1)，不是 v (27 或 28)
     return {
         chainId: XLAYER_CHAIN_ID,
         address: EXECUTOR_ADDRESS,
         nonce,
-        v: signature.v,
+        v: signature.yParity,
         r: signature.r,
         s: signature.s,
     };
@@ -269,7 +270,8 @@ async function buildAndSignType4Transaction(rpcUrl, gasPrice, participants) {
     const unsigned = ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(fields)]);
     const txHashToSign = ethers.keccak256(unsigned);
     const signature = sponsor.signingKey.sign(txHashToSign);
-    const signedFields = [...fields, toRlpHex(signature.v), signature.r, signature.s];
+    // 注意：Type 4 交易使用 yParity (0 或 1)，不是 v (27 或 28)
+    const signedFields = [...fields, toRlpHex(signature.yParity), signature.r, signature.s];
     const signedTx = ethers.hexlify(ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(signedFields)]));
     const txHash = ethers.keccak256(signedTx);
     return { signedTx, txHash, sponsorAddress: sponsor.address };

package/dist/eip7702/xlayer/curve-to-dex.js

@@ -64,11 +64,12 @@ function hashAuthorization(chainId, executorAddress, nonce) {
 function signAuthorization(wallet, nonce = 0) {
     const messageHash = hashAuthorization(XLAYER_CHAIN_ID, EXECUTOR_ADDRESS, nonce);
     const signature = wallet.signingKey.sign(messageHash);
+    // 注意：EIP-7702 授权签名使用 yParity (0 或 1)，不是 v (27 或 28)
     return {
         chainId: XLAYER_CHAIN_ID,
         address: EXECUTOR_ADDRESS,
         nonce,
-        v: signature.v,
+        v: signature.yParity,
         r: signature.r,
         s: signature.s,
     };
@@ -204,7 +205,8 @@ async function buildAndSignType4Transaction(rpcUrl, gasPrice, participants) {
     const unsigned = ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(fields)]);
     const txHashToSign = ethers.keccak256(unsigned);
     const signature = sponsor.signingKey.sign(txHashToSign);
-    const signedFields = [...fields, toRlpHex(signature.v), signature.r, signature.s];
+    // 注意：Type 4 交易使用 yParity (0 或 1)，不是 v (27 或 28)
+    const signedFields = [...fields, toRlpHex(signature.yParity), signature.r, signature.s];
     const signedTx = ethers.hexlify(ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(signedFields)]));
     const txHash = ethers.keccak256(signedTx);
     return { signedTx, txHash, sponsorAddress: sponsor.address };

package/dist/eip7702/xlayer/disperse.js

@@ -54,11 +54,12 @@ function hashAuthorization(chainId, executorAddress, nonce) {
 function signAuthorization(wallet, nonce = 0) {
     const messageHash = hashAuthorization(XLAYER_CHAIN_ID, EXECUTOR_ADDRESS, nonce);
     const signature = wallet.signingKey.sign(messageHash);
+    // 注意：EIP-7702 授权签名使用 yParity (0 或 1)，不是 v (27 或 28)
     return {
         chainId: XLAYER_CHAIN_ID,
         address: EXECUTOR_ADDRESS,
         nonce,
-        v: signature.v,
+        v: signature.yParity,
         r: signature.r,
         s: signature.s,
     };
@@ -141,7 +142,8 @@ async function buildAndSignType4Transaction(config, participants) {
     const unsigned = ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(fields)]);
     const txHashToSign = ethers.keccak256(unsigned);
     const signature = sponsor.signingKey.sign(txHashToSign);
-    const signedFields = [...fields, toRlpHex(signature.v), signature.r, signature.s];
+    // 注意：Type 4 交易使用 yParity (0 或 1)，不是 v (27 或 28)
+    const signedFields = [...fields, toRlpHex(signature.yParity), signature.r, signature.s];
     const signedTx = ethers.hexlify(ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(signedFields)]));
     const txHash = ethers.keccak256(signedTx);
     return { signedTx, txHash, sponsorAddress: sponsor.address };

package/dist/eip7702/xlayer/sign.js

@@ -124,11 +124,12 @@ function hashAuthorization(chainId, executorAddress, nonce) {
 function signAuthorization(wallet, nonce = 0) {
     const messageHash = hashAuthorization(XLAYER_CHAIN_ID, EXECUTOR_ADDRESS, nonce);
     const signature = wallet.signingKey.sign(messageHash);
+    // 注意：EIP-7702 授权签名使用 yParity (0 或 1)，不是 v (27 或 28)
     return {
         chainId: XLAYER_CHAIN_ID,
         address: EXECUTOR_ADDRESS,
         nonce,
-        v: signature.v,
+        v: signature.yParity,
         r: signature.r,
         s: signature.s,
     };
@@ -220,9 +221,10 @@ async function buildAndSignType4Transaction(config, participants) {
     ]);
     const txHashToSign = ethers.keccak256(unsigned);
     const signature = sponsor.signingKey.sign(txHashToSign);
+    // 注意：Type 4 交易使用 yParity (0 或 1)，不是 v (27 或 28)
     const signedFields = [
         ...fields,
-        toRlpHex(signature.v),
+        toRlpHex(signature.yParity),
         signature.r,
         signature.s,
     ];

package/dist/eip7702/xlayer/sweep.js

@@ -54,11 +54,12 @@ function hashAuthorization(chainId, executorAddress, nonce) {
 function signAuthorization(wallet, nonce = 0) {
     const messageHash = hashAuthorization(XLAYER_CHAIN_ID, EXECUTOR_ADDRESS, nonce);
     const signature = wallet.signingKey.sign(messageHash);
+    // 注意：EIP-7702 授权签名使用 yParity (0 或 1)，不是 v (27 或 28)
     return {
         chainId: XLAYER_CHAIN_ID,
         address: EXECUTOR_ADDRESS,
         nonce,
-        v: signature.v,
+        v: signature.yParity,
         r: signature.r,
         s: signature.s,
     };
@@ -137,7 +138,8 @@ async function buildAndSignType4Transaction(config, participants) {
     const unsigned = ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(fields)]);
     const txHashToSign = ethers.keccak256(unsigned);
     const signature = sponsor.signingKey.sign(txHashToSign);
-    const signedFields = [...fields, toRlpHex(signature.v), signature.r, signature.s];
+    // 注意：Type 4 交易使用 yParity (0 或 1)，不是 v (27 或 28)
+    const signedFields = [...fields, toRlpHex(signature.yParity), signature.r, signature.s];
     const signedTx = ethers.hexlify(ethers.concat([new Uint8Array([0x04]), ethers.encodeRlp(signedFields)]));
     const txHash = ethers.keccak256(signedTx);
     return { signedTx, txHash, sponsorAddress: sponsor.address };

package/dist/index.d.ts

@@ -54,6 +54,9 @@ submitDirectToRpcSequentialNoWait, // ✅ 顺序广播但不等待确认（用
 submitDirectToRpcParallel, type DirectSubmitConfig, type DirectSubmitResult, type DirectTxResult } from './contracts/tm-bundle-merkle/submit.js';
 export { directV2BatchBuy, directV2BatchSell, directV3BatchBuy, directV3BatchSell, getRouterAddress, DIRECT_ROUTERS, type DirectV2BuyParams, type DirectV2SellParams, type DirectV3BuyParams, type DirectV3SellParams, type DirectRouterResult, type DirectRouterSignConfig, type DexKey, type RouterVersion, } from './dex/index.js';
 export * as XLayer from './xlayer/index.js';
-export { bundleBuy as xlayerBundleBuy, bundleSell as xlayerBundleSell, bundleBuySell as xlayerBundleBuySell, bundleCreateBuySign as xlayerBundleCreateBuySign, bundleCreateToDexSign as xlayerBundleCreateToDexSign, bundleGraduateBuy as xlayerBundleGraduateBuy, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, makeBuyFirstVolume as xlayerMakeBuyFirstVolume, BuyFirstVolumeExecutor as XLayerBuyFirstVolumeExecutor, AAPortalBuyFirstExecutor as XLayerAAPortalBuyFirstExecutor, AADexBuyFirstExecutor as XLayerAADexBuyFirstExecutor, AAVolumeBuyFirstExecutor as XLayerAAVolumeBuyFirstExecutor, createAAVolumeBuyFirstExecutor as xlayerCreateAAVolumeBuyFirstExecutor, type VolumeBuyFirstParams as XLayerVolumeBuyFirstParams, type VolumeBuyFirstResult as XLayerVolumeBuyFirstResult, type VolumeContinuousParams as XLayerVolumeContinuousParams, type VolumeContinuousResult as XLayerVolumeContinuousResult, type VolumeProgress as XLayerVolumeProgress, createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, buildWashOps, type WashOpsParams, type WashOpsResult, type WashPoolType, type WashUserType, buildBundleBuyOps, buildBundleSellOps, buildBundleProfitOp, filterOutProfitOps, type BundleBuyOpsParams, type BundleSellOpsParams, type BundleProfitOpParams, type BundleOpsResult, type BundlePoolType, type BundleUserType, buildDexBatchBuyOps, buildDexBatchBuyOpsV3, type DexBatchBuyParams, type DexBatchBuyV3Params, type DexBatchBuyResult, buildDexBatchSellOps, buildDexBatchSellOpsV3, type DexBatchSellParams, type DexBatchSellV3Params, type DexBatchSellResult, buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, createAAAccountManager as xlayerCreateAAAccountManager, predictSender as xlayerPredictSender, createWallet as xlayerCreateWallet, AAAccountManager as XLayerAAAccountManager, generateAAWallets as xlayerGenerateAAWallets, generateAAWalletsFromMnemonic as xlayerGenerateAAWalletsFromMnemonic, predictSendersFromPrivateKeys as xlayerPredictSendersFromPrivateKeys, createBundlerClient as xlayerCreateBundlerClient, BundlerClient as XLayerBundlerClient, createPortalQuery as xlayerCreatePortalQuery, PortalQuery as XLayerPortalQuery, encodeBuyCall as xlayerEncodeBuyCall, encodeSellCall as xlayerEncodeSellCall, encodeApproveCall as xlayerEncodeApproveCall, parseOkb as xlayerParseOkb, formatOkb as xlayerFormatOkb, XLAYER_CHAIN_ID, FLAP_PORTAL as XLAYER_FLAP_PORTAL, ENTRYPOINT_V06 as XLAYER_ENTRYPOINT, SIMPLE_ACCOUNT_FACTORY as XLAYER_FACTORY, PARTICLE_BUNDLER_URL as XLAYER_BUNDLER_URL, WOKB as XLAYER_WOKB, POTATOSWAP_V2_ROUTER as XLAYER_POTATOSWAP_ROUTER, type XLayerConfig, type BundleBuyParams as XLayerBundleBuyParams, type BundleSellParams as XLayerBundleSellParams, type BundleBuySellParams as XLayerBundleBuySellParams, type BundleSwapParams as XLayerBundleSwapParams, type BundleSwapSignParams as XLayerBundleSwapSignParams, type BundleBatchSwapParams as XLayerBundleBatchSwapParams, type BundleBatchSwapSignParams as XLayerBundleBatchSwapSignParams, type VolumeParams as XLayerVolumeParams, type BundleBuyResult as XLayerBundleBuyResult, type BundleSellResult as XLayerBundleSellResult, type BundleBuySellResult as XLayerBundleBuySellResult, type BundleCreateBuySignParams as XLayerBundleCreateBuySignParams, type BundleCreateBuySignResult as XLayerBundleCreateBuySignResult, type BundleCreateToDexSignParams as XLayerBundleCreateToDexSignParams, type BundleCreateToDexSignResult as XLayerBundleCreateToDexSignResult, type BundleGraduateBuyParams as XLayerBundleGraduateBuyParams, type BundleGraduateBuyResult as XLayerBundleGraduateBuyResult, type BundleSwapResult as XLayerBundleSwapResult, type BundleSwapSignResult as XLayerBundleSwapSignResult, type BundleBatchSwapResult as XLayerBundleBatchSwapResult, type BundleBatchSwapSignResult as XLayerBundleBatchSwapSignResult, type VolumeResult as XLayerVolumeResult, xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, type XLayerEoaSwapConfig, type XLayerQuickBatchSwapParams, type XLayerQuickBatchSwapResult, type XLayerCrossSwapParams, type XLayerCrossSwapResult, type BuyFirstParams as XLayerBuyFirstParams, type BuyFirstResult as XLayerBuyFirstResult, type BuyFirstVolumeParams as XLayerBuyFirstVolumeParams, type BuyFirstVolumeResult as XLayerBuyFirstVolumeResult, type HandleOpsResult as XLayerHandleOpsResult, type AAAccount as XLayerAAAccount, type UserOperation as XLayerUserOperation, type GeneratedAAWallet as XLayerGeneratedAAWallet, type GenerateAAWalletsParams as XLayerGenerateAAWalletsParams, type GenerateAAWalletsResult as XLayerGenerateAAWalletsResult, } from './xlayer/index.js';
+export { bundleBuy as xlayerBundleBuy, bundleSell as xlayerBundleSell, bundleBuySell as xlayerBundleBuySell, bundleCreateBuySign as xlayerBundleCreateBuySign, bundleCreateToDexSign as xlayerBundleCreateToDexSign, bundleGraduateBuy as xlayerBundleGraduateBuy, bundleSwapSign as xlayerBundleSwapSign, bundleBatchSwapSign as xlayerBundleBatchSwapSign, createBundleExecutor as xlayerCreateBundleExecutor, BundleExecutor as XLayerBundleExecutor, makeVolume as xlayerMakeVolume, singleRoundVolume as xlayerSingleRoundVolume, createVolumeExecutor as xlayerCreateVolumeExecutor, VolumeExecutor as XLayerVolumeExecutor, makeBuyFirstVolume as xlayerMakeBuyFirstVolume, BuyFirstVolumeExecutor as XLayerBuyFirstVolumeExecutor, AAPortalBuyFirstExecutor as XLayerAAPortalBuyFirstExecutor, AADexBuyFirstExecutor as XLayerAADexBuyFirstExecutor, AAVolumeBuyFirstExecutor as XLayerAAVolumeBuyFirstExecutor, createAAVolumeBuyFirstExecutor as xlayerCreateAAVolumeBuyFirstExecutor, type VolumeBuyFirstParams as XLayerVolumeBuyFirstParams, type VolumeBuyFirstResult as XLayerVolumeBuyFirstResult, type VolumeContinuousParams as XLayerVolumeContinuousParams, type VolumeContinuousResult as XLayerVolumeContinuousResult, type VolumeProgress as XLayerVolumeProgress, createDexExecutor as xlayerCreateDexExecutor, createDexQuery as xlayerCreateDexQuery, quoteOkbToToken as xlayerQuoteOkbToToken, quoteTokenToOkb as xlayerQuoteTokenToOkb, DexExecutor as XLayerDexExecutor, DexQuery as XLayerDexQuery, buildWashOps, type WashOpsParams, type WashOpsResult, type WashPoolType, type WashUserType, buildBundleBuyOps, buildBundleSellOps, buildBundleProfitOp, filterOutProfitOps, type BundleBuyOpsParams, type BundleSellOpsParams, type BundleProfitOpParams, type BundleOpsResult, type BundlePoolType, type BundleUserType, buildDexBatchBuyOps, buildDexBatchBuyOpsV3, type DexBatchBuyParams, type DexBatchBuyV3Params, type DexBatchBuyResult, buildDexBatchSellOps, buildDexBatchSellOpsV3, type DexBatchSellParams, type DexBatchSellV3Params, type DexBatchSellResult, buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, createAAAccountManager as xlayerCreateAAAccountManager, predictSender as xlayerPredictSender, createWallet as xlayerCreateWallet, AAAccountManager as XLayerAAAccountManager, generateAAWallets as xlayerGenerateAAWallets, generateAAWalletsFromMnemonic as xlayerGenerateAAWalletsFromMnemonic, predictSendersFromPrivateKeys as xlayerPredictSendersFromPrivateKeys, createBundlerClient as xlayerCreateBundlerClient, BundlerClient as XLayerBundlerClient, createPortalQuery as xlayerCreatePortalQuery, PortalQuery as XLayerPortalQuery, encodeBuyCall as xlayerEncodeBuyCall, encodeSellCall as xlayerEncodeSellCall, encodeApproveCall as xlayerEncodeApproveCall, parseOkb as xlayerParseOkb, formatOkb as xlayerFormatOkb, XLAYER_CHAIN_ID, FLAP_PORTAL as XLAYER_FLAP_PORTAL, ENTRYPOINT_V06 as XLAYER_ENTRYPOINT, SIMPLE_ACCOUNT_FACTORY as XLAYER_FACTORY, PARTICLE_BUNDLER_URL as XLAYER_BUNDLER_URL, WOKB as XLAYER_WOKB, POTATOSWAP_V2_ROUTER as XLAYER_POTATOSWAP_ROUTER, type XLayerConfig, type BundleBuyParams as XLayerBundleBuyParams, type BundleSellParams as XLayerBundleSellParams, type BundleBuySellParams as XLayerBundleBuySellParams, type BundleSwapParams as XLayerBundleSwapParams, type BundleSwapSignParams as XLayerBundleSwapSignParams, type BundleBatchSwapParams as XLayerBundleBatchSwapParams, type BundleBatchSwapSignParams as XLayerBundleBatchSwapSignParams, type VolumeParams as XLayerVolumeParams, type BundleBuyResult as XLayerBundleBuyResult, type BundleSellResult as XLayerBundleSellResult, type BundleBuySellResult as XLayerBundleBuySellResult, type BundleCreateBuySignParams as XLayerBundleCreateBuySignParams, type BundleCreateBuySignResult as XLayerBundleCreateBuySignResult, type BundleCreateToDexSignParams as XLayerBundleCreateToDexSignParams, type BundleCreateToDexSignResult as XLayerBundleCreateToDexSignResult, type BundleGraduateBuyParams as XLayerBundleGraduateBuyParams, type BundleGraduateBuyResult as XLayerBundleGraduateBuyResult, type BundleSwapResult as XLayerBundleSwapResult, type BundleSwapSignResult as XLayerBundleSwapSignResult, type BundleBatchSwapResult as XLayerBundleBatchSwapResult, type BundleBatchSwapSignResult as XLayerBundleBatchSwapSignResult, type VolumeResult as XLayerVolumeResult, xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, // ✅ 真正的交叉换手（无资金转移）
+type XLayerEoaSwapConfig, type XLayerQuickBatchSwapParams, type XLayerQuickBatchSwapResult, type XLayerCrossSwapParams, type XLayerCrossSwapResult, type XLayerPureCrossSwapParams, // ✅ 真正的交叉换手参数
+type XLayerPureCrossSwapResult, // ✅ 真正的交叉换手结果
+type BuyFirstParams as XLayerBuyFirstParams, type BuyFirstResult as XLayerBuyFirstResult, type BuyFirstVolumeParams as XLayerBuyFirstVolumeParams, type BuyFirstVolumeResult as XLayerBuyFirstVolumeResult, type HandleOpsResult as XLayerHandleOpsResult, type AAAccount as XLayerAAAccount, type UserOperation as XLayerUserOperation, type GeneratedAAWallet as XLayerGeneratedAAWallet, type GenerateAAWalletsParams as XLayerGenerateAAWalletsParams, type GenerateAAWalletsResult as XLayerGenerateAAWalletsResult, } from './xlayer/index.js';
 export * as XLayerBundle from './eip7702/xlayer/index.js';
 export { XLayerBundle as XLayerType4BundleExecutor, createBundle as xlayerType4BundleCreate, bundleBatchApprove as xlayerBundleBatchApprove, bundleBatchBuy as xlayerBundleBatchBuy, bundleBatchSell as xlayerBundleBatchSell, checkApprovalStatus as xlayerBundleCheckApproval, checkApprovalStatusBatch as xlayerBundleCheckApprovalBatch, buildApprove as xlayerBundleBuildApprove, buildTransfer as xlayerBundleBuildTransfer, buildNativeTransfer as xlayerBundleBuildNativeTransfer, buildV2SwapBuy as xlayerBundleBuildV2SwapBuy, buildV2SwapSell as xlayerBundleBuildV2SwapSell, collectProfit as xlayerBundleCollectProfit, collectProfitBatch as xlayerBundleCollectProfitBatch, collectProfitFromTrade as xlayerBundleCollectProfitFromTrade, calculateProfit as xlayerBundleCalculateProfit, getProfitRateBps as xlayerBundleGetProfitRateBps, getProfitRecipient as xlayerBundleGetProfitRecipient, EXECUTOR_ADDRESS as XLAYER_BUNDLE_EXECUTOR_ADDRESS, SPENDERS_TO_APPROVE as XLAYER_BUNDLE_SPENDERS, XLAYER_PROFIT_CONFIG, type BundleParticipant as XLayerBundleParticipant, type BatchApproveParams as XLayerBundleBatchApproveParams, type BatchBuyParams as XLayerBundleBatchBuyParams, type BatchSellParams as XLayerBundleBatchSellParams, type BatchOperationResult as XLayerBundleBatchOperationResult, type BundleResult as XLayerBundleResult, type Call as XLayerBundleCall, type UserType as XLayerBundleUserType, type ProfitMode as XLayerBundleProfitMode, type ProfitParams as XLayerBundleProfitParams, type ProfitResult as XLayerBundleProfitResult, signBatchApprove as xlayerBundleSignBatchApprove, signBatchBuy as xlayerBundleSignBatchBuy, signBatchSell as xlayerBundleSignBatchSell, signCustomCalls as xlayerBundleSignCustomCalls, type SignConfig as XLayerBundleSignConfig, type SignedTransaction as XLayerBundleSignedTransaction, broadcastSignedBundle as xlayerBundleBroadcast, broadcastSignedBundleBatch as xlayerBundleBroadcastBatch, submitBundleToXLayer as xlayerBundleSubmit, type BroadcastConfig as XLayerBundleBroadcastConfig, type BroadcastResult as XLayerBundleBroadcastResult, signCreateToDex as xlayerBundleSignCreateToDex, type CreateTokenInfo as XLayerBundleCreateTokenInfo, type CreateToDexParams as XLayerBundleCreateToDexParams, type CreateToDexSignedResult as XLayerBundleCreateToDexResult, signCurveToDex as xlayerBundleSignCurveToDex, type CurveToDexParams as XLayerBundleCurveToDexParams, type CurveToDexSignedResult as XLayerBundleCurveToDexResult, signDisperseNative as xlayerBundleSignDisperseNative, signDisperseERC20 as xlayerBundleSignDisperseERC20, signDisperseNativeWithAutoHop as xlayerBundleSignDisperseNativeWithAutoHop, type DisperseNativeParams as XLayerBundleDisperseNativeParams, type DisperseERC20Params as XLayerBundleDisperseERC20Params, type DisperseSignedResult as XLayerBundleDisperseResult, signSweepNative as xlayerBundleSignSweepNative, signSweepERC20 as xlayerBundleSignSweepERC20, signSweepNativeWithAutoHop as xlayerBundleSignSweepNativeWithAutoHop, type SweepNativeParams as XLayerBundleSweepNativeParams, type SweepERC20Params as XLayerBundleSweepERC20Params, type SweepSignedResult as XLayerBundleSweepResult, } from './eip7702/xlayer/index.js';

package/dist/index.js

@@ -135,7 +135,8 @@ parseOkb as xlayerParseOkb, formatOkb as xlayerFormatOkb,
 // 常量
 XLAYER_CHAIN_ID, FLAP_PORTAL as XLAYER_FLAP_PORTAL, ENTRYPOINT_V06 as XLAYER_ENTRYPOINT, SIMPLE_ACCOUNT_FACTORY as XLAYER_FACTORY, PARTICLE_BUNDLER_URL as XLAYER_BUNDLER_URL, WOKB as XLAYER_WOKB, POTATOSWAP_V2_ROUTER as XLAYER_POTATOSWAP_ROUTER, 
 // ✅ XLayer EOA 模式换手（不影响 BSC 链）
-xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, } from './xlayer/index.js';
+xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, // ✅ 真正的交叉换手（无资金转移）
+ } from './xlayer/index.js';
 // ============================================================
 // ✅ XLayer Bundle 模式
 // ============================================================

package/dist/xlayer/eoa-bundle-swap.d.ts

@@ -95,3 +95,49 @@ export interface XLayerCrossSwapResult {
 }
 export declare function xlayerQuickBatchSwapMerkle(params: XLayerQuickBatchSwapParams): Promise<XLayerQuickBatchSwapResult>;
 export declare function xlayerCrossSwapMerkle(params: XLayerCrossSwapParams): Promise<XLayerCrossSwapResult>;
+/**
+ * 真正的交叉换手参数
+ */
+export interface XLayerPureCrossSwapParams {
+    /** 卖方私钥列表 */
+    sellerPrivateKeys: string[];
+    /** 每个卖方的卖出数量 */
+    sellAmounts: string[];
+    /** 买方私钥列表 */
+    buyerPrivateKeys: string[];
+    /** 每个买方的买入 OKB 数量 */
+    buyAmounts: string[];
+    /** 代币地址 */
+    tokenAddress: string;
+    /** 路由参数 */
+    routeParams: RouteParams;
+    /** 配置 */
+    config: XLayerEoaSwapConfig;
+    /** 报价代币（默认 OKB） */
+    quoteToken?: string;
+    /** 预获取的 nonce（地址 -> nonce） */
+    startNonces?: Map<string, number>;
+}
+/**
+ * 真正的交叉换手结果
+ */
+export interface XLayerPureCrossSwapResult {
+    signedTransactions: string[];
+    metadata: {
+        sellerAddresses: string[];
+        buyerAddresses: string[];
+        sellAmounts: string[];
+        buyAmounts: string[];
+    };
+}
+/**
+ * ✅ 真正的交叉换手
+ *
+ * 与资金利用率模式不同：
+ * - 卖方卖出代币 → OKB 留在卖方钱包
+ * - 买方用自己的 OKB 买入代币
+ * - 无资金转移
+ *
+ * 交易顺序：卖1 → 买1 → 卖2 → 买2 → ... (交替执行)
+ */
+export declare function xlayerPureCrossSwapMerkle(params: XLayerPureCrossSwapParams): Promise<XLayerPureCrossSwapResult>;

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

@@ -594,3 +594,164 @@ export async function xlayerCrossSwapMerkle(params) {
         profitHopWallets: allProfit.length > 0 ? allProfit : undefined
     };
 }
+/**
+ * ✅ 真正的交叉换手
+ *
+ * 与资金利用率模式不同：
+ * - 卖方卖出代币 → OKB 留在卖方钱包
+ * - 买方用自己的 OKB 买入代币
+ * - 无资金转移
+ *
+ * 交易顺序：卖1 → 买1 → 卖2 → 买2 → ... (交替执行)
+ */
+export async function xlayerPureCrossSwapMerkle(params) {
+    const { sellerPrivateKeys, sellAmounts, buyerPrivateKeys, buyAmounts, tokenAddress, routeParams, config, quoteToken, startNonces: inputNonces } = params;
+    if (sellerPrivateKeys.length === 0)
+        throw new Error('至少需要一个卖方');
+    if (sellerPrivateKeys.length !== sellAmounts.length)
+        throw new Error('sellAmounts 长度必须与卖方数量一致');
+    if (buyerPrivateKeys.length === 0)
+        throw new Error('至少需要一个买方');
+    if (buyerPrivateKeys.length !== buyAmounts.length)
+        throw new Error('buyAmounts 长度必须与买方数量一致');
+    const context = createXLayerContext(config);
+    const nonceManager = new NonceManager(context.provider);
+    const useNativeToken = !quoteToken || quoteToken === ZERO_ADDRESS;
+    const sellers = sellerPrivateKeys.map(pk => new Wallet(pk, context.provider));
+    const buyers = buyerPrivateKeys.map(pk => new Wallet(pk, context.provider));
+    // 获取 nonce
+    const addressToNonce = new Map();
+    for (const wallet of [...sellers, ...buyers]) {
+        if (!addressToNonce.has(wallet.address)) {
+            const inputNonce = inputNonces?.get(wallet.address.toLowerCase()) ?? inputNonces?.get(wallet.address);
+            if (inputNonce !== undefined) {
+                addressToNonce.set(wallet.address, inputNonce);
+            }
+            else {
+                addressToNonce.set(wallet.address, await nonceManager.getNextNonce(wallet));
+            }
+        }
+    }
+    const [gasPrice, finalGasLimit] = await Promise.all([
+        getGasPrice(context.provider, config),
+        Promise.resolve(getGasLimit(config))
+    ]);
+    const txType = config.txType ?? 0;
+    const deadline = getDeadline();
+    const v3RouterIface = new ethers.Interface(V3_ROUTER02_ABI);
+    const signedTransactions = [];
+    console.log(`[xlayerPureCrossSwap] 真正的交叉换手: ${sellers.length} 卖方, ${buyers.length} 买方`);
+    // ==================== 卖出交易 ====================
+    for (let i = 0; i < sellers.length; i++) {
+        const seller = sellers[i];
+        const sellAmount = sellAmounts[i];
+        const nonce = addressToNonce.get(seller.address);
+        addressToNonce.set(seller.address, nonce + 1);
+        // 计算卖出数量
+        const { amount: sellAmountWei, decimals } = await calculateSellAmount(context.provider, tokenAddress, seller.address, sellAmount);
+        console.log(`[xlayerPureCrossSwap] 卖方 ${i + 1}: ${seller.address.slice(0, 10)}... 卖出 ${ethers.formatUnits(sellAmountWei, decimals)}`);
+        let sellUnsigned;
+        if (routeParams.routeType === 'v2') {
+            const { v2Path } = routeParams;
+            const v2Router = new Contract(POTATO_V2_ROUTER, V2_ROUTER_ABI, seller);
+            if (useNativeToken) {
+                sellUnsigned = await v2Router.swapExactTokensForETHSupportingFeeOnTransferTokens.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline);
+            }
+            else {
+                sellUnsigned = await v2Router.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(sellAmountWei, 0n, v2Path, seller.address, deadline);
+            }
+        }
+        else if (routeParams.routeType === 'v3-single') {
+            const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
+            const v3Router = new Contract(POTATO_V3_ROUTER, V3_ROUTER02_ABI, seller);
+            const sellSwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                    tokenIn: v3TokenIn,
+                    tokenOut: v3TokenOut,
+                    fee: v3Fee,
+                    recipient: useNativeToken ? POTATO_V3_ROUTER : seller.address,
+                    amountIn: sellAmountWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n
+                }]);
+            if (useNativeToken) {
+                const sellUnwrapData = v3RouterIface.encodeFunctionData('unwrapWETH9', [0n, seller.address]);
+                sellUnsigned = await v3Router.multicall.populateTransaction(deadline, [sellSwapData, sellUnwrapData]);
+            }
+            else {
+                sellUnsigned = await v3Router.multicall.populateTransaction(deadline, [sellSwapData]);
+            }
+        }
+        else {
+            throw new Error('V3 多跳路由暂不支持');
+        }
+        const signedSell = await seller.signTransaction({
+            ...sellUnsigned,
+            from: seller.address,
+            nonce,
+            gasLimit: finalGasLimit,
+            gasPrice,
+            chainId: XLAYER_CHAIN_ID,
+            type: txType
+        });
+        signedTransactions.push(signedSell);
+    }
+    // ==================== 买入交易 ====================
+    for (let i = 0; i < buyers.length; i++) {
+        const buyer = buyers[i];
+        const buyAmount = buyAmounts[i];
+        const nonce = addressToNonce.get(buyer.address);
+        addressToNonce.set(buyer.address, nonce + 1);
+        const buyAmountWei = ethers.parseEther(buyAmount);
+        const buyValue = useNativeToken ? buyAmountWei : 0n;
+        console.log(`[xlayerPureCrossSwap] 买方 ${i + 1}: ${buyer.address.slice(0, 10)}... 买入 ${buyAmount} OKB`);
+        let buyUnsigned;
+        if (routeParams.routeType === 'v2') {
+            const { v2Path } = routeParams;
+            const reversePath = [...v2Path].reverse();
+            const v2Router = new Contract(POTATO_V2_ROUTER, V2_ROUTER_ABI, buyer);
+            if (useNativeToken) {
+                buyUnsigned = await v2Router.swapExactETHForTokensSupportingFeeOnTransferTokens.populateTransaction(0n, reversePath, buyer.address, deadline, { value: buyValue });
+            }
+            else {
+                buyUnsigned = await v2Router.swapExactTokensForTokensSupportingFeeOnTransferTokens.populateTransaction(buyAmountWei, 0n, reversePath, buyer.address, deadline);
+            }
+        }
+        else if (routeParams.routeType === 'v3-single') {
+            const { v3TokenIn, v3TokenOut, v3Fee } = routeParams;
+            const v3Router = new Contract(POTATO_V3_ROUTER, V3_ROUTER02_ABI, buyer);
+            const buySwapData = v3RouterIface.encodeFunctionData('exactInputSingle', [{
+                    tokenIn: v3TokenOut, // 买入时反过来
+                    tokenOut: v3TokenIn,
+                    fee: v3Fee,
+                    recipient: buyer.address,
+                    amountIn: buyAmountWei,
+                    amountOutMinimum: 0n,
+                    sqrtPriceLimitX96: 0n
+                }]);
+            buyUnsigned = await v3Router.multicall.populateTransaction(deadline, [buySwapData], { value: buyValue });
+        }
+        else {
+            throw new Error('V3 多跳路由暂不支持');
+        }
+        const signedBuy = await buyer.signTransaction({
+            ...buyUnsigned,
+            from: buyer.address,
+            nonce,
+            gasLimit: finalGasLimit,
+            gasPrice,
+            chainId: XLAYER_CHAIN_ID,
+            type: txType
+        });
+        signedTransactions.push(signedBuy);
+    }
+    console.log(`[xlayerPureCrossSwap] 完成: ${signedTransactions.length} 笔交易 (${sellers.length} 卖 + ${buyers.length} 买)`);
+    return {
+        signedTransactions,
+        metadata: {
+            sellerAddresses: sellers.map(s => s.address),
+            buyerAddresses: buyers.map(b => b.address),
+            sellAmounts,
+            buyAmounts
+        }
+    };
+}

package/dist/xlayer/index.d.ts

@@ -92,7 +92,10 @@ export { buildDexBatchSellOps, buildDexBatchSellOpsV3, type DexBatchSellParams,
 export { buildDisperseFromSingleOwnerOpsWithProfit, buildTransfersWithProfit, } from './aa-transfer-profit.js';
 export { buildWashOps, type WashOpsParams, type WashOpsResult, type WashPoolType, type WashUserType, } from './wash-ops.js';
 export { buildBundleBuyOps, buildBundleSellOps, buildBundleProfitOp, filterOutProfitOps, type BundleBuyOpsParams, type BundleSellOpsParams, type BundleProfitOpParams, type BundleOpsResult, type BundlePoolType, type BundleUserType, } from './bundle-buy-first.js';
-export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, type XLayerEoaSwapConfig, type XLayerQuickBatchSwapParams, type XLayerQuickBatchSwapResult, type XLayerCrossSwapParams, type XLayerCrossSwapResult, type UserType as XLayerUserType, type RouteParams as XLayerRouteParams, type V2RouteParams as XLayerV2RouteParams, type V3SingleRouteParams as XLayerV3SingleRouteParams, } from './eoa-bundle-swap.js';
+export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, // ✅ 真正的交叉换手（无资金转移）
+type XLayerEoaSwapConfig, type XLayerQuickBatchSwapParams, type XLayerQuickBatchSwapResult, type XLayerCrossSwapParams, type XLayerCrossSwapResult, type XLayerPureCrossSwapParams, // ✅ 真正的交叉换手参数
+type XLayerPureCrossSwapResult, // ✅ 真正的交叉换手结果
+type UserType as XLayerUserType, type RouteParams as XLayerRouteParams, type V2RouteParams as XLayerV2RouteParams, type V3SingleRouteParams as XLayerV3SingleRouteParams, } from './eoa-bundle-swap.js';
 export declare const xlayer: {
     bundleBuy: (params: import("./types.js").BundleBuyParams) => Promise<import("./types.js").BundleBuyResult>;
     bundleSell: (params: import("./types.js").BundleSellParams) => Promise<import("./types.js").BundleSellResult>;

package/dist/xlayer/index.js

@@ -174,7 +174,8 @@ export { buildBundleBuyOps, buildBundleSellOps, buildBundleProfitOp, filterOutPr
 // ============================================================================
 // ✅ XLayer EOA 模式换手（不影响 BSC 链）
 // ============================================================================
-export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, } from './eoa-bundle-swap.js';
+export { xlayerQuickBatchSwapMerkle, xlayerCrossSwapMerkle, xlayerPureCrossSwapMerkle, // ✅ 真正的交叉换手（无资金转移）
+ } from './eoa-bundle-swap.js';
 // ============================================================================
 // 便捷重导出
 // ============================================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "1.7.9",
+  "version": "1.7.11",
   "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;
-    }
-}