@rabby-wallet/rabby-swap 0.0.88-alpha.3 → 0.0.88

package/dist/abi.d.ts

@@ -335,6 +335,4 @@ export declare const SushiABI: ({
     stateMutability: string;
     type: string;
 })[];
-export { UniABI } from "./calldata/uni/abi";
-export { MagpieABI } from "./calldata/magpie/abi";
 export declare const PancakeSwapABI: string[];

package/dist/abi.js

@@ -1652,8 +1652,6 @@ export const ZeroXABIV2 = [
     { stateMutability: "payable", type: "fallback" },
 ];
 export const SushiABI = [{ "inputs": [], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [{ "internalType": "address", "name": "tokenOut", "type": "address" }, { "internalType": "uint256", "name": "amountOut", "type": "uint256" }], "name": "MinimalOutputBalanceViolation", "type": "error" }, { "inputs": [], "name": "safeExecutor", "outputs": [{ "internalType": "contract SafeExecutor", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "contract IERC20", "name": "tokenIn", "type": "address" }, { "internalType": "uint256", "name": "amountIn", "type": "uint256" }, { "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "contract IERC20", "name": "tokenOut", "type": "address" }, { "internalType": "uint256", "name": "amountOutMin", "type": "uint256" }, { "internalType": "address", "name": "executor", "type": "address" }, { "internalType": "bytes", "name": "executorData", "type": "bytes" }], "name": "snwap", "outputs": [{ "internalType": "uint256", "name": "amountOut", "type": "uint256" }], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "components": [{ "internalType": "contract IERC20", "name": "token", "type": "address" }, { "internalType": "uint256", "name": "amountIn", "type": "uint256" }, { "internalType": "address", "name": "transferTo", "type": "address" }], "internalType": "struct InputToken[]", "name": "inputTokens", "type": "tuple[]" }, { "components": [{ "internalType": "contract IERC20", "name": "token", "type": "address" }, { "internalType": "address", "name": "recipient", "type": "address" }, { "internalType": "uint256", "name": "amountOutMin", "type": "uint256" }], "internalType": "struct OutputToken[]", "name": "outputTokens", "type": "tuple[]" }, { "components": [{ "internalType": "address", "name": "executor", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" }, { "internalType": "bytes", "name": "data", "type": "bytes" }], "internalType": "struct Executor[]", "name": "executors", "type": "tuple[]" }], "name": "snwapMultiple", "outputs": [{ "internalType": "uint256[]", "name": "amountOut", "type": "uint256[]" }], "stateMutability": "payable", "type": "function" }];
-export { UniABI } from "./calldata/uni/abi";
-export { MagpieABI } from "./calldata/magpie/abi";
 // IAggregator.swapExactIn from the official router's verified implementation:
 // https://sourcify.dev/server/v2/contract/56/0x88b20da52208607e3bf06a59605acebbe7d2e3d6?fields=abi,sources
 export const PancakeSwapABI = [

package/dist/dexs/magpie.d.ts

@@ -1,4 +1,5 @@
 import { CHAINS_ENUM } from "@debank/common";
-export { decodeCalldata } from "../calldata/magpie";
+import { TxWithChainId, DecodeCalldataResult } from "../quote";
 export declare const SUPPORT_CHAINS: CHAINS_ENUM[];
 export declare const getQuote: (options: import("../quote").QuoteParams, api: import("@rabby-wallet/rabby-api").OpenApiService) => Promise<import("../quote").QuoteResult>;
+export declare const decodeCalldata: (tx: TxWithChainId) => DecodeCalldataResult | null;

package/dist/dexs/magpie.js

@@ -1,7 +1,6 @@
 import { CHAINS_ENUM } from "@debank/common";
 import { generateGetQuote } from "../utils";
 import { DEX_ENUM } from "../consts";
-export { decodeCalldata } from "../calldata/magpie";
 export const SUPPORT_CHAINS = [
     CHAINS_ENUM.ETH,
     CHAINS_ENUM.OP,
@@ -38,3 +37,6 @@ export const getQuote = generateGetQuote({
     id: "magpie",
     dex: DEX_ENUM.MAGPIE,
 });
+export const decodeCalldata = (tx) => {
+    return null;
+};

package/dist/dexs/uni.d.ts

@@ -1,5 +1,7 @@
 import { CHAINS_ENUM } from "@debank/common";
-export { decodeCalldata } from "../calldata/uni";
+import { TxWithChainId, DecodeCalldataResult } from "../quote";
 export declare const SUPPORT_CHAINS: CHAINS_ENUM[];
 export declare const UNI_NATIVE_TO_ADDRESSES: Record<CHAINS_ENUM, string>;
+export declare const UNI_LEGACY_NATIVE_TO_ADDRESSES: Record<CHAINS_ENUM, string>;
 export declare const getQuote: (options: import("../quote").QuoteParams, api: import("@rabby-wallet/rabby-api").OpenApiService) => Promise<import("../quote").QuoteResult>;
+export declare const decodeCalldata: (tx: TxWithChainId) => DecodeCalldataResult | null;

package/dist/dexs/uni.js

@@ -1,7 +1,6 @@
 import { CHAINS_ENUM } from "@debank/common";
 import { generateGetQuote } from "../utils";
 import { DEX_ENUM } from "../consts";
-export { decodeCalldata } from "../calldata/uni";
 export const SUPPORT_CHAINS = [
     CHAINS_ENUM.ETH,
     CHAINS_ENUM.OP,
@@ -19,7 +18,27 @@ export const SUPPORT_CHAINS = [
     "HOOD",
     "ARC",
 ];
+// Native-input tx.to: UR 2.1.2, zkSync 2.0, or SwapProxy on Celo/Tempo.
+// https://github.com/Uniswap/universal-router/tree/543e1a19d6e21e31ced2512eec5792b50f13a0ba/deploy-addresses
 export const UNI_NATIVE_TO_ADDRESSES = {
+    [CHAINS_ENUM.ETH]: "0x23617e59A5925b2A4Bf75d73ff6711cD0b29De85",
+    [CHAINS_ENUM.OP]: "0xC09255D86DB563cBc11C2fCf4a0C512e160111B4",
+    [CHAINS_ENUM.BSC]: "0xDc264714F68d84CF29BC605589405E78bDBE7C9f",
+    [CHAINS_ENUM.POLYGON]: "0xDc264714F68d84CF29BC605589405E78bDBE7C9f",
+    [CHAINS_ENUM.ARBITRUM]: "0x2d01411773c8C24805306E89A41F7855C3c4Fe65",
+    [CHAINS_ENUM.AVAX]: "0x661E93cca42AfacB172121EF892830cA3b70F08d",
+    [CHAINS_ENUM.BASE]: "0xd6145b2D3F379919E8CdEda7B97e37c4b2Ca9c40",
+    [CHAINS_ENUM.BLAST]: "0x661E93cca42AfacB172121EF892830cA3b70F08d",
+    [CHAINS_ENUM.CELO]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+    [CHAINS_ENUM.ERA]: "0x28731BCC616B5f51dD52CF2e4dF0E78dD1136C06",
+    ["UNI"]: "0xD1b797D92d87B688193A2B976eFc8D577D204343",
+    ["TEMPO"]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+    ["MONAD"]: "0xa6CE4F10d83dBdDAc17E68e1837ca9cE6a1b596e",
+    ["HOOD"]: "0x204FAca1764B154221e35c0d20aBb3c525710498",
+    ["ARC"]: "0x8702463e73f74d0b6765aBceb314Ef07aCb92650",
+};
+// Keep the pre-upgrade native entry points valid during the backend rollout.
+export const UNI_LEGACY_NATIVE_TO_ADDRESSES = {
     [CHAINS_ENUM.ETH]: "0x66a9893cC07D91D95644AEDD05D03f95e1dBA8Af",
     [CHAINS_ENUM.OP]: "0x851116D9223fabED8E56C0E6b8Ad0c31d98B3507",
     [CHAINS_ENUM.BSC]: "0x1906c1d672b88cD1B9aC7593301cA990F94Eae07",
@@ -41,3 +60,6 @@ export const getQuote = generateGetQuote({
     id: "uni",
     dex: DEX_ENUM.UNI,
 });
+export const decodeCalldata = (tx) => {
+    return null;
+};

package/dist/index.d.ts

@@ -5,5 +5,3 @@ import { UNI_NATIVE_TO_ADDRESSES } from "./dexs/uni";
 export * from "./tokenPools";
 export * from "./verify";
 export { WrapTokenAddressMap, ARC_ERC20_USDC, DEX_ENUM, DEX_SUPPORT_CHAINS, getQuote, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, UNI_NATIVE_TO_ADDRESSES, };
-export { decodeCalldata } from "./quote";
-export type { DecodeCalldataOptions, DecodeCalldataResult, TxWithChainId, } from "./calldata/types";

package/dist/index.js

@@ -5,4 +5,3 @@ import { UNI_NATIVE_TO_ADDRESSES } from "./dexs/uni";
 export * from "./tokenPools";
 export * from "./verify";
 export { WrapTokenAddressMap, ARC_ERC20_USDC, DEX_ENUM, DEX_SUPPORT_CHAINS, getQuote, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, UNI_NATIVE_TO_ADDRESSES, };
-export { decodeCalldata } from "./quote";

package/dist/quote.d.ts

@@ -1,8 +1,6 @@
 import { CHAINS_ENUM } from "@debank/common";
 import { OpenApiService } from "@rabby-wallet/rabby-api";
 import { DEX_ENUM } from "./consts";
-import type { Tx, TxWithChainId, DecodeCalldataOptions, DecodeCalldataResult } from "./calldata/types";
-export type { Tx, TxWithChainId, DecodeCalldataOptions, DecodeCalldataResult, } from "./calldata/types";
 export interface QuoteParams {
     fromToken: string;
     fromTokenDecimals: number;
@@ -19,6 +17,18 @@ export interface QuoteParams {
     chainServerId: string;
     nativeTokenAddress: string;
 }
+export interface Tx {
+    from: string;
+    to: string;
+    data: string;
+    value: string;
+    chainId?: number;
+    gas?: number;
+    gasPrice?: string;
+}
+export interface TxWithChainId extends Tx {
+    chainId: number;
+}
 export interface QuoteResult {
     tx: Tx;
     fromToken: string;
@@ -33,4 +43,11 @@ export interface QuoteResult {
     origin?: Awaited<ReturnType<OpenApiService["getSwapQuote"]>>;
 }
 export declare const getQuote: (id: DEX_ENUM, params: QuoteParams, api: OpenApiService) => Promise<QuoteResult>;
-export declare const decodeCalldata: (id: DEX_ENUM, tx: TxWithChainId, options?: DecodeCalldataOptions) => DecodeCalldataResult | null;
+export interface DecodeCalldataResult {
+    fromToken: string;
+    fromTokenAmount: string;
+    toToken: string;
+    minReceiveToTokenAmount: string;
+    toTokenReceiver: string;
+}
+export declare const decodeCalldata: (id: DEX_ENUM, tx: TxWithChainId) => DecodeCalldataResult | null;

package/dist/quote.js

@@ -56,7 +56,7 @@ export const getQuote = (id, params, api) => __awaiter(void 0, void 0, void 0, f
             throw new Error(`${id} is not supported!`);
     }
 });
-export const decodeCalldata = (id, tx, options = {}) => {
+export const decodeCalldata = (id, tx) => {
     switch (id) {
         case DEX_ENUM.ONEINCH:
             return oneInchDecodeCalldata(tx);
@@ -75,13 +75,13 @@ export const decodeCalldata = (id, tx, options = {}) => {
         case DEX_ENUM.ZEROXAPIV2:
             return zeroXV2DecodeCalldata(tx);
         case DEX_ENUM.MAGPIE:
-            return magpieDecodeCalldata(tx, options);
+            return magpieDecodeCalldata(tx);
         case DEX_ENUM.RABBY:
             return rabbyDecodeCalldata(tx);
         case DEX_ENUM.SUSHI:
             return sushiDecodeCalldata(tx);
         case DEX_ENUM.UNI:
-            return uniDecodeCalldata(tx, options);
+            return uniDecodeCalldata(tx);
         case DEX_ENUM.PANCAKESWAP:
             return pancakeDecodeCalldata(tx);
         default:

package/dist/verify/calldata.d.ts

@@ -1,21 +1,25 @@
 import { DEX_ENUM } from "../consts";
-import type { DecodeCalldataOptions, DecodeCalldataResult, TxWithChainId } from "../calldata/types";
-import type { QuoteResult } from "../quote";
-/** 解码出的 minReceive 相对「报价 × (1-滑点)」允许的相对偏差。 */
+import { DecodeCalldataResult, QuoteResult, TxWithChainId } from "../quote";
+/** 解码出的 minReceive 相对「报价 × (1-滑点)」允许的相对偏差。两端现网均为 5%。 */
 export declare const CALLDATA_MIN_RECEIVE_TOLERANCE = 0.05;
-/** wrap、无 dex、无 tx、解码失败时返回 null。 */
-export declare const decodeSwapCalldata: (dexId: DEX_ENUM | null, tx?: TxWithChainId, options?: DecodeCalldataOptions) => DecodeCalldataResult | null;
-/** token、支付数量、最低到手比对；收款地址由 receiver 模块校验。 */
-export declare const matchDecodedCalldata: (decoded: DecodeCalldataResult, quote: QuoteResult, slippageRatio: string | number, requirePositiveMinimum?: boolean) => boolean;
+/**
+ * 尝试解码。wrap、无 dex、无 tx、解码抛错或解不出时返回 null。
+ */
+export declare const decodeSwapCalldata: (dexId: DEX_ENUM | null, tx?: TxWithChainId) => DecodeCalldataResult | null;
+/** 纯比对：token、支付数量、最低到手（相对滑点带）。 */
+export declare const matchDecodedCalldata: (decoded: DecodeCalldataResult, quote: QuoteResult, slippageRatio: string | number) => boolean;
 export type VerifyCalldataParams = {
     data: QuoteResult | null;
     dexId: DEX_ENUM | null;
     /** 已换算成小数的滑点，如 1% → 0.01。 */
     slippage: string | number;
     tx?: TxWithChainId;
+    /** 传入则不再解码。 */
     decoded?: DecodeCalldataResult | null;
-    nativeTokenAddress?: string;
 };
-/** 其他 DEX 沿用的跳过策略；Uni/Magpie 必须完成字段校验。 */
+/** 解不出、无滑点或无报价时跳过比对（现网视为通过）。 */
 export declare const shouldSkipCalldataMatch: (slippage: string | number, decoded: DecodeCalldataResult | null, data: QuoteResult | null, tx?: TxWithChainId) => boolean;
+/**
+ * 解码并与报价比对。解码成功后不再依赖应用链目录。
+ */
 export declare const verifyCalldata: (p: VerifyCalldataParams) => boolean;

package/dist/verify/calldata.js

@@ -1,66 +1,44 @@
 import BigNumber from "bignumber.js";
 import { DEX_ENUM } from "../consts";
-import { getNativeTokenAddress } from "../calldata/chain";
-import { decodeInputFee } from "../calldata/magpie";
-import { getComparableUniInputAmount } from "../calldata/uni/assets";
-import { decodeCalldata } from "../quote";
+import { decodeCalldata, } from "../quote";
 import { isSameAddress } from "../utils";
-/** 解码出的 minReceive 相对「报价 × (1-滑点)」允许的相对偏差。 */
+/** 解码出的 minReceive 相对「报价 × (1-滑点)」允许的相对偏差。两端现网均为 5%。 */
 export const CALLDATA_MIN_RECEIVE_TOLERANCE = 0.05;
-/** wrap、无 dex、无 tx、解码失败时返回 null。 */
-export const decodeSwapCalldata = (dexId, tx, options = {}) => {
-    if (!dexId || dexId === DEX_ENUM.WRAPTOKEN || !tx)
+/**
+ * 尝试解码。wrap、无 dex、无 tx、解码抛错或解不出时返回 null。
+ */
+export const decodeSwapCalldata = (dexId, tx) => {
+    if (!dexId || dexId === DEX_ENUM.WRAPTOKEN || !tx) {
         return null;
+    }
     try {
-        return decodeCalldata(dexId, tx, options);
+        return decodeCalldata(dexId, tx);
     }
     catch (_a) {
         return null;
     }
 };
-/** token、支付数量、最低到手比对；收款地址由 receiver 模块校验。 */
-export const matchDecodedCalldata = (decoded, quote, slippageRatio, requirePositiveMinimum = false) => {
-    const minimum = new BigNumber(quote.toTokenAmount).times(new BigNumber(1).minus(slippageRatio));
-    return ((!requirePositiveMinimum || minimum.gt(0)) &&
-        isSameAddress(decoded.fromToken, quote.fromToken) &&
+/** 纯比对：token、支付数量、最低到手（相对滑点带）。 */
+export const matchDecodedCalldata = (decoded, quote, slippageRatio) => {
+    const estimateMinReceive = new BigNumber(quote.toTokenAmount).times(new BigNumber(1).minus(slippageRatio));
+    return (isSameAddress(decoded.fromToken, quote.fromToken) &&
         decoded.fromTokenAmount === quote.fromTokenAmount &&
         isSameAddress(decoded.toToken, quote.toToken) &&
         new BigNumber(decoded.minReceiveToTokenAmount)
-            .minus(minimum)
-            .div(minimum)
+            .minus(estimateMinReceive)
+            .div(estimateMinReceive)
             .abs()
             .lte(CALLDATA_MIN_RECEIVE_TOLERANCE));
 };
-/** 其他 DEX 沿用的跳过策略；Uni/Magpie 必须完成字段校验。 */
+/** 解不出、无滑点或无报价时跳过比对（现网视为通过）。 */
 export const shouldSkipCalldataMatch = (slippage, decoded, data, tx) => !slippage || !decoded || !data || !tx;
+/**
+ * 解码并与报价比对。解码成功后不再依赖应用链目录。
+ */
 export const verifyCalldata = (p) => {
-    const decoded = p.decoded !== undefined
-        ? p.decoded
-        : decodeSwapCalldata(p.dexId, p.tx, {
-            nativeTokenAddress: p.nativeTokenAddress,
-        });
-    if (p.dexId === DEX_ENUM.UNI || p.dexId === DEX_ENUM.MAGPIE) {
-        if (!p.tx || !decoded || !p.data)
-            return false;
-        let requestedAmount = p.data.fromTokenAmount;
-        let inputAmount = decoded.fromTokenAmount;
-        try {
-            if (p.dexId === DEX_ENUM.MAGPIE) {
-                // Encoded input-asset fees are transferred separately from amountIn.
-                inputAmount = new BigNumber(inputAmount)
-                    .plus(decodeInputFee(p.tx, decoded))
-                    .toFixed(0);
-            }
-            else {
-                requestedAmount = getComparableUniInputAmount(requestedAmount, decoded, p.tx.chainId, getNativeTokenAddress(p.tx.chainId, p.nativeTokenAddress));
-            }
-        }
-        catch (_a) {
-            return false;
-        }
-        return matchDecodedCalldata(Object.assign(Object.assign({}, decoded), { fromTokenAmount: inputAmount }), Object.assign(Object.assign({}, p.data), { fromTokenAmount: requestedAmount }), p.slippage, true);
-    }
-    if (shouldSkipCalldataMatch(p.slippage, decoded, p.data, p.tx))
+    const decoded = p.decoded !== undefined ? p.decoded : decodeSwapCalldata(p.dexId, p.tx);
+    if (shouldSkipCalldataMatch(p.slippage, decoded, p.data, p.tx)) {
         return true;
+    }
     return matchDecodedCalldata(decoded, p.data, p.slippage);
 };

package/dist/verify/contracts.d.ts

@@ -1,6 +1,6 @@
 import { CHAINS_ENUM } from "@debank/common";
 import { DEX_ENUM } from "../consts";
-/** Uni 的 native 输入（含 Arc ERC20 USDC）直接走 Universal Router，其余走 proxy。 */
+/** Uni 的 native 输入（含 Arc ERC20 USDC）按链选择执行入口，其余走 proxy。 */
 export declare const getRouter: (dexId: DEX_ENUM, chain: CHAINS_ENUM, payTokenId: string, nativeTokenAddress: string) => string | undefined;
 /** wrap 无 spender；其余读白名单。 */
 export declare const getSpender: (dexId: DEX_ENUM, chain: CHAINS_ENUM) => string | undefined;

package/dist/verify/contracts.js

@@ -1,15 +1,16 @@
 import { ARC_ERC20_USDC, DEX_ENUM } from "../consts";
-import { UNI_NATIVE_TO_ADDRESSES } from "../dexs/uni";
+import { UNI_LEGACY_NATIVE_TO_ADDRESSES, UNI_NATIVE_TO_ADDRESSES, } from "../dexs/uni";
 import { DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST } from "../list";
 import { isSameAddress } from "../utils";
 import { isSwapWrapToken } from "./wrap";
 const isNativeToken = (tokenId, nativeTokenAddress) => isSameAddress(tokenId, nativeTokenAddress);
-/** Uni 的 native 输入（含 Arc ERC20 USDC）直接走 Universal Router，其余走 proxy。 */
+const isUniNativeInput = (dexId, chain, payTokenId, nativeTokenAddress) => dexId === DEX_ENUM.UNI &&
+    (isNativeToken(payTokenId, nativeTokenAddress) ||
+        (chain === "ARC" &&
+            isSameAddress(payTokenId, ARC_ERC20_USDC)));
+/** Uni 的 native 输入（含 Arc ERC20 USDC）按链选择执行入口，其余走 proxy。 */
 export const getRouter = (dexId, chain, payTokenId, nativeTokenAddress) => {
-    if (dexId === DEX_ENUM.UNI &&
-        (isNativeToken(payTokenId, nativeTokenAddress) ||
-            (chain === "ARC" &&
-                isSameAddress(payTokenId, ARC_ERC20_USDC)))) {
+    if (isUniNativeInput(dexId, chain, payTokenId, nativeTokenAddress)) {
         return UNI_NATIVE_TO_ADDRESSES[chain];
     }
     const list = DEX_ROUTER_WHITELIST[dexId];
@@ -41,11 +42,14 @@ export const verifyRouterAndSpender = (p) => {
     }
     const routerWhitelist = getRouter(dexId, chain, payTokenId, nativeTokenAddress);
     const spenderWhitelist = getSpender(dexId, chain);
+    const routerPass = isSameAddress(routerWhitelist || "", router) ||
+        (isUniNativeInput(dexId, chain, payTokenId, nativeTokenAddress) &&
+            isSameAddress(UNI_LEGACY_NATIVE_TO_ADDRESSES[chain] || "", router));
     const skipSpender = !spender ||
         isNativeToken(payTokenId, nativeTokenAddress) ||
         isSwapWrapToken(payTokenId, receiveTokenId, chain, nativeTokenAddress);
     return [
-        isSameAddress(routerWhitelist || "", router),
+        routerPass,
         skipSpender ? true : isSameAddress(spenderWhitelist || "", spender),
     ];
 };

package/dist/verify/sdk.d.ts

@@ -1,7 +1,6 @@
 import { CHAINS_ENUM } from "@debank/common";
 import { DEX_ENUM } from "../consts";
-import type { DecodeCalldataResult } from "../calldata/types";
-import type { QuoteResult } from "../quote";
+import { DecodeCalldataResult, QuoteResult } from "../quote";
 export type VerifySdkParams = {
     chain: CHAINS_ENUM;
     dexId: DEX_ENUM;

package/dist/verify/sdk.js

@@ -26,16 +26,13 @@ export const verifySdk = (p) => {
     });
     const tx = toTxWithChainId(p.data, p.chainId);
     const slippageRatio = new BigNumber(p.slippage).div(100).toFixed();
-    const decoded = decodeSwapCalldata(actualDexId, tx, {
-        nativeTokenAddress: p.nativeTokenAddress,
-    });
+    const decoded = decodeSwapCalldata(actualDexId, tx);
     const callDataPass = verifyCalldata({
         data: p.data,
         dexId: actualDexId,
         slippage: slippageRatio,
         tx,
         decoded,
-        nativeTokenAddress: p.nativeTokenAddress,
     });
     const receiverPass = isSwapCalldataReceiverAllowed(decoded === null || decoded === void 0 ? void 0 : decoded.toTokenReceiver, p.userAddress);
     return {

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@rabby-wallet/rabby-swap",
-  "version": "0.0.88-alpha.3",
+  "version": "0.0.88",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
     "build": "rimraf dist && tsc",
     "preversion": "npm run build",
-    "prepublishOnly": "npm test && npm run build",
-    "test:swap-calldata": "jest --runInBand --watchman=false --runTestsByPath __tests__/swapCalldata.test.ts __tests__/swapCalldataFixtures.test.ts"
+    "prepublishOnly": "npm test && npm run build"
   },
   "files": [
     "dist"
@@ -19,12 +18,8 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.7.0",
-    "@uniswap/sdk-core": "7.19.4",
-    "@uniswap/universal-router-sdk": "5.14.0",
-    "@uniswap/v2-sdk": "4.21.5",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
-    "ethers": "5.8.0",
     "web3-eth-abi": "^1.8.1"
   },
   "devDependencies": {

package/dist/calldata/chain.d.ts

@@ -1 +0,0 @@
-export declare const getNativeTokenAddress: (chainId: number, nativeTokenAddress?: string) => string;

package/dist/calldata/chain.js

@@ -1,9 +0,0 @@
-import { CHAINS } from "@debank/common";
-export const getNativeTokenAddress = (chainId, nativeTokenAddress) => {
-    var _a;
-    const native = nativeTokenAddress !== null && nativeTokenAddress !== void 0 ? nativeTokenAddress : (_a = Object.values(CHAINS).find((chain) => chain.id === chainId)) === null || _a === void 0 ? void 0 : _a.nativeTokenAddress;
-    if (!native) {
-        throw new Error(`Native token is not configured for chain ${chainId}`);
-    }
-    return native;
-};

package/dist/calldata/magpie/abi.d.ts

@@ -1 +0,0 @@
-export declare const MagpieABI: string[];

package/dist/calldata/magpie/abi.js

@@ -1,3 +0,0 @@
-export const MagpieABI = [
-    "function swapWithBackendSignature(bytes swapData) payable returns (uint256 amountOut)",
-];

package/dist/calldata/magpie/dexAggregator.d.ts

@@ -1,3 +0,0 @@
-import { PackedReader, PackedSwap } from "./packed";
-export declare const decodeDexAggregator: (data: PackedReader) => PackedSwap;
-export declare const decodeDexAggregatorInputFee: (data: PackedReader) => string;

package/dist/calldata/magpie/dexAggregator.js

@@ -1,30 +0,0 @@
-import BigNumber from "bignumber.js";
-// DexAggregator LibRouter.getData(), verified Arbitrum source:
-// https://sourcify.dev/server/v2/contract/42161/0x20F6ee51340aDEed01A59B0e65cB3703f3dc860c?fields=sources
-export const decodeDexAggregator = (data) => ({
-    receiver: data.address(72),
-    fromAsset: data.address(92),
-    toAsset: data.address(112),
-    amountIn: data.uint(132),
-    amountOutMin: data.compact(167, 168),
-});
-// LibRouter.getData(): byte 274 holds the fee count, followed by three
-// arrays of compact descriptors (asset, receiver, amount), 3 bytes per entry.
-// transferFees() transfers these separately from the swap's amountIn.
-// Only fees paid in the input asset belong in its total debit.
-// https://sourcify.dev/server/v2/contract/42161/0x20F6ee51340aDEed01A59B0e65cB3703f3dc860c?fields=sources
-// https://docs.fly.trade/developers/api-reference/evm-swap-integration-guide#step-1-get-a-quote
-export const decodeDexAggregatorInputFee = (data) => {
-    const count = Number(data.uint(274, 1));
-    const inputAsset = new BigNumber(data.address(92).slice(2), 16);
-    let total = new BigNumber(0);
-    for (let index = 0; index < count; index++) {
-        const assetOffset = 275 + index * 3;
-        const amountOffset = 275 + (count * 2 + index) * 3;
-        const asset = data.compact(assetOffset, assetOffset + 1);
-        const amount = data.compact(amountOffset, amountOffset + 1);
-        if (inputAsset.eq(asset))
-            total = total.plus(amount);
-    }
-    return total.toFixed(0);
-};

package/dist/calldata/magpie/index.d.ts

@@ -1,3 +0,0 @@
-import type { DecodeCalldataOptions, DecodeCalldataResult, TxWithChainId } from "../types";
-export declare const decodeInputFee: (tx: TxWithChainId, decoded?: DecodeCalldataResult) => string;
-export declare const decodeCalldata: (tx: TxWithChainId, options?: DecodeCalldataOptions) => DecodeCalldataResult;

package/dist/calldata/magpie/index.js

@@ -1,65 +0,0 @@
-import { utils } from "ethers";
-import BigNumber from "bignumber.js";
-import { getNativeTokenAddress } from "../chain";
-import { isSameAddress, NULL_ADDRESS } from "../../utils";
-import { MagpieABI } from "./abi";
-import { decodeDexAggregator, decodeDexAggregatorInputFee, } from "./dexAggregator";
-import { PackedReader } from "./packed";
-const magpieInterface = new utils.Interface(MagpieABI);
-const dexAggregatorSelector = magpieInterface.getSighash("swapWithBackendSignature");
-// Keep parsing details private and tied to the decoded result's lifetime.
-const decodedPayloads = new WeakMap();
-const readPayload = (tx) => {
-    const selector = tx.data.slice(0, 10).toLowerCase();
-    if (selector !== dexAggregatorSelector) {
-        throw new Error(`Unsupported Magpie calldata selector: ${selector}`);
-    }
-    const transaction = magpieInterface.parseTransaction({ data: tx.data });
-    const payloadLength = utils.arrayify(transaction.args[0]).length;
-    return new PackedReader(tx.data, payloadLength);
-};
-export const decodeInputFee = (tx, decoded) => {
-    var _a;
-    const cached = decoded && decodedPayloads.get(decoded);
-    if (cached && cached.data === tx.data) {
-        return ((_a = cached.inputFee) !== null && _a !== void 0 ? _a : (cached.inputFee = decodeDexAggregatorInputFee(cached.payload)));
-    }
-    return decodeDexAggregatorInputFee(readPayload(tx));
-};
-export const decodeCalldata = (tx, options = {}) => {
-    const native = getNativeTokenAddress(tx.chainId, options.nativeTokenAddress);
-    const payload = readPayload(tx);
-    const swap = decodeDexAggregator(payload);
-    const nativeInput = isSameAddress(swap.fromAsset, NULL_ADDRESS);
-    let amountIn = new BigNumber(swap.amountIn);
-    // DexAggregator.adjustAmountIn(): zero means automatic input, not a zero
-    // debit. Native input is known from value minus encoded native fees;
-    // ERC20 input depends on min(balance, allowance), unavailable offline.
-    // https://sourcify.dev/server/v2/contract/42161/0x20F6ee51340aDEed01A59B0e65cB3703f3dc860c?fields=sources
-    const inputFee = nativeInput ? decodeDexAggregatorInputFee(payload) : "0";
-    if (amountIn.isZero()) {
-        if (!nativeInput)
-            throw new Error("Automatic ERC20 input depends on onchain balance and allowance; it cannot be determined from calldata alone");
-        amountIn = new BigNumber(tx.value).minus(inputFee);
-    }
-    if (!amountIn.gt(0))
-        throw new Error("Original input amount is zero or unresolved");
-    if (nativeInput && !amountIn.plus(inputFee).eq(tx.value))
-        throw new Error("Native transaction value does not equal input amount plus encoded native fees");
-    const decoded = {
-        fromToken: isSameAddress(swap.fromAsset, NULL_ADDRESS)
-            ? native
-            : swap.fromAsset,
-        fromTokenAmount: amountIn.toFixed(0),
-        toToken: isSameAddress(swap.toAsset, NULL_ADDRESS) ? native : swap.toAsset,
-        minReceiveToTokenAmount: swap.amountOutMin,
-        // LibRouter reads toAddress literally; zero is not a msg.sender sentinel.
-        toTokenReceiver: swap.receiver,
-    };
-    decodedPayloads.set(decoded, {
-        data: tx.data,
-        payload,
-        inputFee: nativeInput ? inputFee : undefined,
-    });
-    return decoded;
-};

package/dist/calldata/magpie/packed.d.ts

@@ -1,16 +0,0 @@
-export interface PackedSwap {
-    receiver: string;
-    fromAsset: string;
-    toAsset: string;
-    amountIn: string;
-    amountOutMin: string;
-}
-export declare class PackedReader {
-    private readonly payloadLength;
-    private readonly hex;
-    constructor(data: string, payloadLength: number);
-    private read;
-    address(offset: number): string;
-    uint(offset: number, length?: number): string;
-    compact(shiftOffset: number, pointerOffset: number): string;
-}

package/dist/calldata/magpie/packed.js

@@ -1,30 +0,0 @@
-import BigNumber from "bignumber.js";
-// Offsets include the selector. Reads must stay inside the declared bytes payload.
-export class PackedReader {
-    constructor(data, payloadLength) {
-        this.payloadLength = payloadLength;
-        this.hex = data.slice(2);
-    }
-    read(offset, length) {
-        if (offset < 68 || offset + length > 68 + this.payloadLength) {
-            throw new Error(`Packed field points outside the Magpie bytes payload (offset ${offset}, length ${length})`);
-        }
-        return this.hex.slice(offset * 2, (offset + length) * 2);
-    }
-    address(offset) {
-        return `0x${this.read(offset, 20)}`.toLowerCase();
-    }
-    uint(offset, length = 32) {
-        return new BigNumber(this.read(offset, length), 16).toFixed(0);
-    }
-    compact(shiftOffset, pointerOffset) {
-        const shift = Number(this.uint(shiftOffset, 1));
-        const pointer = Number(this.uint(pointerOffset, 2));
-        // Only the high (256 - shift) bits survive Solidity's shr.
-        const significantBits = 256 - shift;
-        const length = Math.ceil(significantBits / 8);
-        return new BigNumber(this.uint(pointer, length))
-            .idiv(new BigNumber(2).pow(length * 8 - significantBits))
-            .toFixed(0);
-    }
-}

package/dist/calldata/types.d.ts

@@ -1,22 +0,0 @@
-export interface Tx {
-    from: string;
-    to: string;
-    data: string;
-    value: string;
-    chainId?: number;
-    gas?: number;
-    gasPrice?: string;
-}
-export interface TxWithChainId extends Tx {
-    chainId: number;
-}
-export interface DecodeCalldataOptions {
-    nativeTokenAddress?: string;
-}
-export interface DecodeCalldataResult {
-    fromToken: string;
-    fromTokenAmount: string;
-    toToken: string;
-    minReceiveToTokenAmount: string;
-    toTokenReceiver: string;
-}

package/dist/calldata/types.js

@@ -1 +0,0 @@
-export {};

package/dist/calldata/uni/abi.d.ts

@@ -1,3 +0,0 @@
-export declare const UniversalRouterABI: import("ethers/lib/utils").FunctionFragment[];
-export declare const SwapProxyABI: import("ethers/lib/utils").FunctionFragment[];
-export declare const UniABI: import("ethers/lib/utils").FunctionFragment[];

package/dist/calldata/uni/abi.js

@@ -1,6 +0,0 @@
-import { SwapRouter } from "@uniswap/universal-router-sdk";
-// The current quote flow uses execute directly or through SwapProxy.
-// Keep the official ABI as the source of truth, excluding signed execution.
-export const UniversalRouterABI = Object.values(SwapRouter.INTERFACE.functions).filter((fragment) => fragment.name === "execute");
-export const SwapProxyABI = Object.values(SwapRouter.PROXY_INTERFACE.functions);
-export const UniABI = [...UniversalRouterABI, ...SwapProxyABI];