four-flap-meme-sdk 1.5.27 → 1.5.29

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

@@ -0,0 +1,295 @@
+/**
+ * XLayer AA 外盘 (PotatoSwap/DEX) 捆绑换手实现
+ */
+import { Wallet, ethers } from 'ethers';
+import { AANonceMap, } from './types.js';
+import { POTATOSWAP_V2_ROUTER, WOKB, } from './constants.js';
+import { AAAccountManager, encodeExecute } from './aa-account.js';
+import { encodeApproveCall, } from './portal-ops.js';
+import { DexQuery, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, } from './dex.js';
+import { BundleExecutor } from './bundle.js';
+function getDexDeadline(minutes = 20) {
+    return Math.floor(Date.now() / 1000) + minutes * 60;
+}
+/**
+ * XLayer AA 外盘换手执行器
+ */
+export class AADexSwapExecutor {
+    constructor(config = {}) {
+        this.config = config;
+        this.aaManager = new AAAccountManager(config);
+        this.dexQuery = new DexQuery({
+            rpcUrl: config.rpcUrl,
+            chainId: config.chainId,
+        });
+        this.bundleExecutor = new BundleExecutor(config);
+    }
+    /**
+     * 获取 Router 地址
+     */
+    getEffectiveRouter(params) {
+        if (params.routerAddress)
+            return params.routerAddress;
+        if (params.dexKey === 'DYORSWAP') {
+            return '0xfb001fbbace32f09cb6d3c449b935183de53ee96';
+        }
+        return POTATOSWAP_V2_ROUTER;
+    }
+    /**
+     * AA 外盘单钱包换手签名
+     */
+    async bundleSwapSign(params) {
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKey, sellAmount, sellPercent = 100, buyAmountOkb, slippageBps = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
+        const provider = this.aaManager.getProvider();
+        const sellerOwner = new Wallet(sellerPrivateKey, provider);
+        const buyerOwner = new Wallet(buyerPrivateKey, provider);
+        const payerWallet = new Wallet(payerPrivateKey || sellerPrivateKey, provider);
+        const beneficiary = beneficiaryIn || payerWallet.address;
+        const [sellerAi, buyerAi] = await this.aaManager.getMultipleAccountInfo([sellerOwner.address, buyerOwner.address]);
+        const sellerSender = sellerAi.sender;
+        const buyerSender = buyerAi.sender;
+        const nonceMap = new AANonceMap();
+        nonceMap.init(sellerSender, sellerAi.nonce);
+        nonceMap.init(buyerSender, buyerAi.nonce);
+        // initCode：确保“同一 sender”只在第一笔 op 携带
+        const initCodeBySenderLower = new Map();
+        const initIfNeeded = (sender, deployed, ownerAddress) => {
+            const k = sender.toLowerCase();
+            if (initCodeBySenderLower.has(k))
+                return;
+            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
+        };
+        const consumeInitCode = (sender) => {
+            const k = sender.toLowerCase();
+            const cur = initCodeBySenderLower.get(k);
+            if (cur === undefined)
+                throw new Error(`initCode not initialized for sender: ${sender}`);
+            if (cur !== '0x')
+                initCodeBySenderLower.set(k, '0x');
+            return cur;
+        };
+        initIfNeeded(sellerSender, !!sellerAi?.deployed, sellerOwner.address);
+        initIfNeeded(buyerSender, !!buyerAi?.deployed, buyerOwner.address);
+        const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
+        const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerSender);
+        const sellAmountWei = sellAmount
+            ? ethers.parseUnits(String(sellAmount), decimals)
+            : (sellerTokenBal * BigInt(sellPercent)) / 100n;
+        if (sellAmountWei <= 0n)
+            throw new Error('卖出数量无效');
+        // 授权检查
+        let needApprove = false;
+        if (!skipApprovalCheck) {
+            const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerSender, effectiveRouter);
+            needApprove = allowance < sellAmountWei;
+        }
+        // 报价
+        let finalBuyAmountWei;
+        if (buyAmountOkb) {
+            finalBuyAmountWei = ethers.parseEther(String(buyAmountOkb));
+        }
+        else {
+            const quoted = await this.dexQuery.quoteTokenToOkb(sellAmountWei, tokenAddress);
+            finalBuyAmountWei = (quoted * BigInt(10000 - slippageBps)) / 10000n;
+        }
+        const outOps = [];
+        if (needApprove) {
+            const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: sellerOwner,
+                sender: sellerSender,
+                nonce: nonceMap.next(sellerSender),
+                initCode: consumeInitCode(sellerSender),
+                callData: encodeExecute(tokenAddress, 0n, encodeApproveCall(effectiveRouter)),
+                deployed: sellerAi.deployed,
+            });
+            const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
+            outOps.push(signedApprove.userOp);
+        }
+        // Sell op
+        const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerSender, getDexDeadline());
+        const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
+        const signedSell = await this.aaManager.buildUserOpWithState({
+            ownerWallet: sellerOwner,
+            sender: sellerSender,
+            nonce: nonceMap.next(sellerSender),
+            initCode: consumeInitCode(sellerSender),
+            callData: sellCallData,
+            signOnly: true,
+        });
+        outOps.push(signedSell.userOp);
+        // Buy op
+        const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], buyerSender, getDexDeadline());
+        const buyCallData = encodeExecute(effectiveRouter, finalBuyAmountWei, buySwapData);
+        const signedBuy = await this.aaManager.buildUserOpWithState({
+            ownerWallet: buyerOwner,
+            sender: buyerSender,
+            nonce: nonceMap.next(buyerSender),
+            initCode: consumeInitCode(buyerSender),
+            callData: buyCallData,
+            signOnly: true,
+        });
+        outOps.push(signedBuy.userOp);
+        const signedHandleOps = await this.bundleExecutor['signHandleOpsTx']({
+            ops: outOps,
+            payerWallet,
+            beneficiary,
+            nonce: payerStartNonce,
+        });
+        const signedTransactions = [signedHandleOps];
+        if (routeAddress) {
+            const tx = ethers.Transaction.from(signedHandleOps);
+            const tailTx = await payerWallet.signTransaction({
+                to: routeAddress,
+                value: 0n,
+                nonce: Number(tx.nonce) + 1,
+                gasLimit: 21000n,
+                gasPrice: tx.gasPrice,
+                chainId: tx.chainId,
+                type: 0,
+            });
+            signedTransactions.push(tailTx);
+        }
+        return {
+            signedTransactions,
+            metadata: {
+                payer: payerWallet.address,
+                beneficiary,
+                sellerOwner: sellerOwner.address,
+                sellerSender,
+                buyerOwner: buyerOwner.address,
+                buyerSender,
+                sellAmountWei: sellAmountWei.toString(),
+                buyAmountWei: finalBuyAmountWei.toString(),
+                hasApprove: needApprove,
+                routeAddress,
+            },
+        };
+    }
+    /**
+     * AA 外盘批量换手签名
+     */
+    async bundleBatchSwapSign(params) {
+        const { dexKey, routerAddress: routerAddressIn, tokenAddress, sellerPrivateKey, buyerPrivateKeys, buyAmountsOkb, sellAmount, sellPercent = 100, payerPrivateKey, beneficiary: beneficiaryIn, payerStartNonce, routeAddress, skipApprovalCheck = false, } = params;
+        const effectiveRouter = this.getEffectiveRouter({ dexKey, routerAddress: routerAddressIn });
+        const provider = this.aaManager.getProvider();
+        const sellerOwner = new Wallet(sellerPrivateKey, provider);
+        const buyerOwners = buyerPrivateKeys.map(pk => new Wallet(pk, provider));
+        const payerWallet = new Wallet(payerPrivateKey || sellerPrivateKey, provider);
+        const beneficiary = beneficiaryIn || payerWallet.address;
+        const accountInfos = await this.aaManager.getMultipleAccountInfo([sellerOwner.address, ...buyerOwners.map(w => w.address)]);
+        const sellerAi = accountInfos[0];
+        const buyerAis = accountInfos.slice(1);
+        const nonceMap = new AANonceMap();
+        nonceMap.init(sellerAi.sender, sellerAi.nonce);
+        buyerAis.forEach(ai => nonceMap.init(ai.sender, ai.nonce));
+        // initCode：确保同一 sender 只在第一笔 op 携带
+        const initCodeBySenderLower = new Map();
+        const initIfNeeded = (sender, deployed, ownerAddress) => {
+            const k = sender.toLowerCase();
+            if (initCodeBySenderLower.has(k))
+                return;
+            initCodeBySenderLower.set(k, deployed ? '0x' : this.aaManager.generateInitCode(ownerAddress));
+        };
+        const consumeInitCode = (sender) => {
+            const k = sender.toLowerCase();
+            const cur = initCodeBySenderLower.get(k);
+            if (cur === undefined)
+                throw new Error(`initCode not initialized for sender: ${sender}`);
+            if (cur !== '0x')
+                initCodeBySenderLower.set(k, '0x');
+            return cur;
+        };
+        initIfNeeded(sellerAi.sender, sellerAi.deployed, sellerOwner.address);
+        for (let i = 0; i < buyerOwners.length; i++) {
+            initIfNeeded(buyerAis[i].sender, buyerAis[i].deployed, buyerOwners[i].address);
+        }
+        const decimals = await this.bundleExecutor['getErc20Decimals'](tokenAddress);
+        const sellerTokenBal = await this.aaManager.getErc20Balance(tokenAddress, sellerAi.sender);
+        const sellAmountWei = sellAmount
+            ? ethers.parseUnits(String(sellAmount), decimals)
+            : (sellerTokenBal * BigInt(sellPercent)) / 100n;
+        let needApprove = false;
+        if (!skipApprovalCheck) {
+            const allowance = await this.aaManager.getErc20Allowance(tokenAddress, sellerAi.sender, effectiveRouter);
+            needApprove = allowance < sellAmountWei;
+        }
+        const outOps = [];
+        if (needApprove) {
+            const { userOp } = await this.aaManager.buildUserOpWithFixedGas({
+                ownerWallet: sellerOwner,
+                sender: sellerAi.sender,
+                nonce: nonceMap.next(sellerAi.sender),
+                initCode: consumeInitCode(sellerAi.sender),
+                callData: encodeExecute(tokenAddress, 0n, encodeApproveCall(effectiveRouter)),
+                deployed: sellerAi.deployed,
+            });
+            const signedApprove = await this.aaManager.signUserOp(userOp, sellerOwner);
+            outOps.push(signedApprove.userOp);
+        }
+        // Sell op
+        const sellSwapData = encodeSwapExactTokensForETHSupportingFee(sellAmountWei, 0n, [tokenAddress, WOKB], sellerAi.sender, getDexDeadline());
+        const sellCallData = encodeExecute(effectiveRouter, 0n, sellSwapData);
+        const signedSell = await this.aaManager.buildUserOpWithState({
+            ownerWallet: sellerOwner,
+            sender: sellerAi.sender,
+            nonce: nonceMap.next(sellerAi.sender),
+            initCode: consumeInitCode(sellerAi.sender),
+            callData: sellCallData,
+            signOnly: true,
+        });
+        outOps.push(signedSell.userOp);
+        // Batch Buy ops
+        const buyAmountsWei = buyAmountsOkb.map(a => ethers.parseEther(a));
+        for (let i = 0; i < buyerOwners.length; i++) {
+            const ai = buyerAis[i];
+            const buyWei = buyAmountsWei[i];
+            const buySwapData = encodeSwapExactETHForTokensSupportingFee(0n, [WOKB, tokenAddress], ai.sender, getDexDeadline());
+            const buyCallData = encodeExecute(effectiveRouter, buyWei, buySwapData);
+            const signedBuy = await this.aaManager.buildUserOpWithState({
+                ownerWallet: buyerOwners[i],
+                sender: ai.sender,
+                nonce: nonceMap.next(ai.sender),
+                initCode: consumeInitCode(ai.sender),
+                callData: buyCallData,
+                signOnly: true,
+            });
+            outOps.push(signedBuy.userOp);
+        }
+        const signedHandleOps = await this.bundleExecutor['signHandleOpsTx']({
+            ops: outOps,
+            payerWallet,
+            beneficiary,
+            nonce: payerStartNonce,
+        });
+        const signedTransactions = [signedHandleOps];
+        if (routeAddress) {
+            const tx = ethers.Transaction.from(signedHandleOps);
+            const tailTx = await payerWallet.signTransaction({
+                to: routeAddress,
+                value: 0n,
+                nonce: Number(tx.nonce) + 1,
+                gasLimit: 21000n,
+                gasPrice: tx.gasPrice,
+                chainId: tx.chainId,
+                type: 0,
+            });
+            signedTransactions.push(tailTx);
+        }
+        return {
+            signedTransactions,
+            metadata: {
+                payer: payerWallet.address,
+                beneficiary,
+                sellerOwner: sellerOwner.address,
+                sellerSender: sellerAi.sender,
+                buyerOwners: buyerOwners.map(w => w.address),
+                buyerSenders: buyerAis.map(ai => ai.sender),
+                sellAmountWei: sellAmountWei.toString(),
+                buyAmountsWei: buyAmountsWei.map(w => w.toString()),
+                hasApprove: needApprove,
+                routeAddress,
+            },
+        };
+    }
+}

package/dist/xlayer/index.d.ts

@@ -58,20 +58,37 @@
  */
 export * from './constants.js';
 export * from './types.js';
+import type { BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
 export { BundlerClient, createBundlerClient, type BundlerConfig, type BundlerReceipt, } from './bundler.js';
 export { AAAccountManager, createAAAccountManager, predictSender, createWallet, encodeExecute, encodeExecuteBatch, generateAAWallets, generateAAWalletsFromMnemonic, predictSendersFromPrivateKeys, type GeneratedAAWallet, type GenerateAAWalletsParams, type GenerateAAWalletsResult, } from './aa-account.js';
 export { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, PortalQuery, createPortalQuery, applySlippage, formatOkb, parseOkb, formatTokenAmount, parseTokenAmount, type PortalQueryConfig, } from './portal-ops.js';
-export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleSwap, bundleSwapSign, bundleBatchSwap, bundleBatchSwapSign, } from './bundle.js';
+export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, } from './bundle.js';
+export { AAPortalSwapExecutor, } from './portal-bundle-swap.js';
+export { AADexSwapExecutor, } from './dex-bundle-swap.js';
+/**
+ * XLayer AA 换手签名 (卖 -> 买)
+ */
+export declare function bundleSwapSign(params: BundleSwapSignParams & {
+    skipApprovalCheck?: boolean;
+}): Promise<BundleSwapSignResult>;
+/**
+ * XLayer AA 批量换手签名 (一卖多买)
+ */
+export declare function bundleBatchSwapSign(params: BundleBatchSwapSignParams & {
+    skipApprovalCheck?: boolean;
+}): Promise<BundleBatchSwapSignResult>;
 export { VolumeExecutor, createVolumeExecutor, makeVolume, singleRoundVolume, } from './volume.js';
 export { DexQuery, DexExecutor, createDexQuery, createDexExecutor, quoteOkbToToken, quoteTokenToOkb, encodeSwapExactETHForTokens, encodeSwapExactTokensForETH, encodeSwapExactTokensForTokens, encodeSwapExactETHForTokensSupportingFee, encodeSwapExactTokensForETHSupportingFee, encodeSwapExactTokensForTokensSupportingFee, type DexConfig, } from './dex.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>;
     bundleBuySell: (params: import("./types.js").BundleBuySellParams) => Promise<import("./types.js").BundleBuySellResult>;
-    bundleSwap: (params: import("./types.js").BundleSwapParams) => Promise<import("./types.js").BundleSwapResult>;
-    bundleSwapSign: (params: import("./types.js").BundleSwapSignParams) => Promise<import("./types.js").BundleSwapSignResult>;
-    bundleBatchSwap: (params: import("./types.js").BundleBatchSwapParams) => Promise<import("./types.js").BundleBatchSwapResult>;
-    bundleBatchSwapSign: (params: import("./types.js").BundleBatchSwapSignParams) => Promise<import("./types.js").BundleBatchSwapSignResult>;
+    bundleSwapSign: (params: BundleSwapSignParams & {
+        skipApprovalCheck?: boolean;
+    }) => Promise<BundleSwapSignResult>;
+    bundleBatchSwapSign: (params: BundleBatchSwapSignParams & {
+        skipApprovalCheck?: boolean;
+    }) => Promise<BundleBatchSwapSignResult>;
     makeVolume: (params: import("./types.js").VolumeParams) => Promise<import("./types.js").VolumeResult>;
     quoteOkbToToken: (okbAmount: bigint, tokenAddress: string, config?: import("./dex.js").DexConfig | undefined) => Promise<bigint>;
     quoteTokenToOkb: (tokenAmount: bigint, tokenAddress: string, config?: import("./dex.js").DexConfig | undefined) => Promise<bigint>;

package/dist/xlayer/index.js

@@ -81,7 +81,36 @@ export { encodeBuyCall, encodeSellCall, encodeApproveCall, encodeTransferCall, P
 // ============================================================================
 // 捆绑交易
 // ============================================================================
-export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, bundleSwap, bundleSwapSign, bundleBatchSwap, bundleBatchSwapSign, } from './bundle.js';
+export { BundleExecutor, createBundleExecutor, bundleBuy, bundleSell, bundleBuySell, } from './bundle.js';
+// ============================================================================
+// 捆绑换手 (AASwap)
+// ============================================================================
+export { AAPortalSwapExecutor, } from './portal-bundle-swap.js';
+export { AADexSwapExecutor, } from './dex-bundle-swap.js';
+/**
+ * XLayer AA 换手签名 (卖 -> 买)
+ */
+export async function bundleSwapSign(params) {
+    const { tradeType = 'FLAP' } = params;
+    if (tradeType === 'FLAP') {
+        return new (await import('./portal-bundle-swap.js')).AAPortalSwapExecutor(params.config).bundleSwapSign(params);
+    }
+    else {
+        return new (await import('./dex-bundle-swap.js')).AADexSwapExecutor(params.config).bundleSwapSign(params);
+    }
+}
+/**
+ * XLayer AA 批量换手签名 (一卖多买)
+ */
+export async function bundleBatchSwapSign(params) {
+    const { tradeType = 'FLAP' } = params;
+    if (tradeType === 'FLAP') {
+        return new (await import('./portal-bundle-swap.js')).AAPortalSwapExecutor(params.config).bundleBatchSwapSign(params);
+    }
+    else {
+        return new (await import('./dex-bundle-swap.js')).AADexSwapExecutor(params.config).bundleBatchSwapSign(params);
+    }
+}
 // ============================================================================
 // 刷量/做市
 // ============================================================================
@@ -112,22 +141,9 @@ export const xlayer = {
         const { bundleBuySell } = await import('./bundle.js');
         return bundleBuySell(...args);
     },
-    bundleSwap: async (...args) => {
-        const { bundleSwap } = await import('./bundle.js');
-        return bundleSwap(...args);
-    },
-    bundleSwapSign: async (...args) => {
-        const { bundleSwapSign } = await import('./bundle.js');
-        return bundleSwapSign(...args);
-    },
-    bundleBatchSwap: async (...args) => {
-        const { bundleBatchSwap } = await import('./bundle.js');
-        return bundleBatchSwap(...args);
-    },
-    bundleBatchSwapSign: async (...args) => {
-        const { bundleBatchSwapSign } = await import('./bundle.js');
-        return bundleBatchSwapSign(...args);
-    },
+    // 捆绑换手（AA）：仅签名（raw signed tx）
+    bundleSwapSign: async (...args) => bundleSwapSign(...args),
+    bundleBatchSwapSign: async (...args) => bundleBatchSwapSign(...args),
     // 刷量
     makeVolume: async (...args) => {
         const { makeVolume } = await import('./volume.js');

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

@@ -0,0 +1,26 @@
+/**
+ * XLayer AA 内盘 (Flap Portal) 捆绑换手实现
+ */
+import { XLayerConfig, BundleSwapSignParams, BundleSwapSignResult, BundleBatchSwapSignParams, BundleBatchSwapSignResult } from './types.js';
+/**
+ * XLayer AA 内盘换手执行器
+ */
+export declare class AAPortalSwapExecutor {
+    private aaManager;
+    private portalQuery;
+    private bundleExecutor;
+    private config;
+    constructor(config?: XLayerConfig);
+    /**
+     * AA 内盘单钱包换手签名
+     */
+    bundleSwapSign(params: BundleSwapSignParams & {
+        skipApprovalCheck?: boolean;
+    }): Promise<BundleSwapSignResult>;
+    /**
+     * AA 内盘批量换手签名 (一卖多买)
+     */
+    bundleBatchSwapSign(params: BundleBatchSwapSignParams & {
+        skipApprovalCheck?: boolean;
+    }): Promise<BundleBatchSwapSignResult>;
+}