@rabby-wallet/rabby-swap 0.0.74 → 0.0.75-beta.0

package/dist/abi.d.ts

@@ -142,40 +142,6 @@ export declare const OpenOceanABI: ({
     type: string;
     anonymous?: undefined;
 })[];
-export declare const UniswapABI: ({
-    inputs: {
-        components: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-})[];
 export declare const KyberswapABI: ({
     inputs: {
         internalType: string;

package/dist/abi.js

@@ -764,91 +764,6 @@ export const OpenOceanABI = [
         type: "function",
     },
 ];
-export const UniswapABI = [
-    {
-        inputs: [
-            {
-                components: [
-                    {
-                        internalType: "bytes",
-                        name: "path",
-                        type: "bytes",
-                    },
-                    {
-                        internalType: "address",
-                        name: "recipient",
-                        type: "address",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "deadline",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "amountIn",
-                        type: "uint256",
-                    },
-                    {
-                        internalType: "uint256",
-                        name: "amountOutMinimum",
-                        type: "uint256",
-                    },
-                ],
-                internalType: "struct ISwapRouter.ExactInputParams",
-                name: "params",
-                type: "tuple",
-            },
-        ],
-        name: "exactInput",
-        outputs: [
-            {
-                internalType: "uint256",
-                name: "amountOut",
-                type: "uint256",
-            },
-        ],
-        stateMutability: "payable",
-        type: "function",
-    },
-    {
-        inputs: [
-            {
-                internalType: "bytes[]",
-                name: "data",
-                type: "bytes[]",
-            },
-        ],
-        name: "multicall",
-        outputs: [
-            {
-                internalType: "bytes[]",
-                name: "results",
-                type: "bytes[]",
-            },
-        ],
-        stateMutability: "payable",
-        type: "function",
-    },
-    {
-        inputs: [
-            {
-                internalType: "uint256",
-                name: "amountMinimum",
-                type: "uint256",
-            },
-            {
-                internalType: "address",
-                name: "recipient",
-                type: "address",
-            },
-        ],
-        name: "unwrapWETH9",
-        outputs: [],
-        stateMutability: "payable",
-        type: "function",
-    },
-];
 export const KyberswapABI = [
     {
         inputs: [{ internalType: "address", name: "_WETH", type: "address" }],

package/dist/consts.d.ts

@@ -4,11 +4,11 @@ export declare enum DEX_ENUM {
     ZEROXAPI = "0xAPI",
     WRAPTOKEN = "WrapToken",
     OPENOCEAN = "OpenOcean",
-    UNISWAP = "Uniswap",
     KYBERSWAP = "Kyberswap",
     PARASWAPV6 = "ParaSwapV6",
     ODOS = "ODOS",
     ZEROXAPIV2 = "0xAPIV2",
     MAGPIE = "Magpie",
-    RABBY = "Rabby"
+    RABBY = "Rabby",
+    UNI = "Uniswap"
 }

package/dist/consts.js

@@ -5,11 +5,11 @@ export var DEX_ENUM;
     DEX_ENUM["ZEROXAPI"] = "0xAPI";
     DEX_ENUM["WRAPTOKEN"] = "WrapToken";
     DEX_ENUM["OPENOCEAN"] = "OpenOcean";
-    DEX_ENUM["UNISWAP"] = "Uniswap";
     DEX_ENUM["KYBERSWAP"] = "Kyberswap";
     DEX_ENUM["PARASWAPV6"] = "ParaSwapV6";
     DEX_ENUM["ODOS"] = "ODOS";
     DEX_ENUM["ZEROXAPIV2"] = "0xAPIV2";
     DEX_ENUM["MAGPIE"] = "Magpie";
     DEX_ENUM["RABBY"] = "Rabby";
+    DEX_ENUM["UNI"] = "Uniswap";
 })(DEX_ENUM || (DEX_ENUM = {}));

package/dist/dexs/{uniswap.d.ts → uni.d.ts}

@@ -1,7 +1,6 @@
+import { CHAINS_ENUM } from "@debank/common";
 import { TxWithChainId, DecodeCalldataResult } from "../quote";
-/**
- * @deprecated
- */
-export declare const SUPPORT_CHAINS: never[];
+export declare const SUPPORT_CHAINS: CHAINS_ENUM[];
+export declare const UNI_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

@@ -0,0 +1,37 @@
+import { CHAINS_ENUM } from "@debank/common";
+import { generateGetQuote } from "../utils";
+import { DEX_ENUM } from "../consts";
+export const SUPPORT_CHAINS = [
+    CHAINS_ENUM.ETH,
+    CHAINS_ENUM.OP,
+    CHAINS_ENUM.BSC,
+    CHAINS_ENUM.POLYGON,
+    CHAINS_ENUM.ARBITRUM,
+    CHAINS_ENUM.AVAX,
+    CHAINS_ENUM.BASE,
+    CHAINS_ENUM.BLAST,
+    CHAINS_ENUM.CELO,
+    CHAINS_ENUM.ERA,
+    "UNI",
+];
+export const UNI_NATIVE_TO_ADDRESSES = {
+    [CHAINS_ENUM.ETH]: "0x66a9893cC07D91D95644AEDD05D03f95e1dBA8Af",
+    [CHAINS_ENUM.OP]: "0x851116D9223fabED8E56C0E6b8Ad0c31d98B3507",
+    [CHAINS_ENUM.BSC]: "0x1906c1d672b88cD1B9aC7593301cA990F94Eae07",
+    [CHAINS_ENUM.POLYGON]: "0x1095692A6237d83C6a72F3F5eFEdb9A670C49223",
+    [CHAINS_ENUM.ARBITRUM]: "0xA51afAFe0263b40EdaEf0Df8781eA9aa03E381a3",
+    [CHAINS_ENUM.AVAX]: "0x94b75331AE8d42C1b61065089B7d48FE14aA73b7",
+    [CHAINS_ENUM.BASE]: "0x6fF5693b99212Da76ad316178A184AB56D299b43",
+    [CHAINS_ENUM.BLAST]: "0xeAbBcB3E8E415306207ef514f660A3F820025BE3",
+    [CHAINS_ENUM.CELO]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+    [CHAINS_ENUM.ERA]: "0x28731BCC616B5f51dD52CF2e4dF0E78dD1136C06",
+    ["UNI"]: "0xEf740bf23aCaE26f6492B10de645D6B98dC8Eaf3",
+};
+export const getQuote = generateGetQuote({
+    SUPPORT_CHAINS,
+    id: "uni",
+    dex: DEX_ENUM.UNI,
+});
+export const decodeCalldata = (tx) => {
+    return null;
+};

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { WrapTokenAddressMap, DEX_SUPPORT_CHAINS, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST } from "./list";
 import { getQuote } from "./quote";
 import { DEX_ENUM } from "./consts";
-export { WrapTokenAddressMap, DEX_ENUM, DEX_SUPPORT_CHAINS, getQuote, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, };
+import { UNI_NATIVE_TO_ADDRESSES } from "./dexs/uni";
+export { WrapTokenAddressMap, DEX_ENUM, DEX_SUPPORT_CHAINS, getQuote, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, UNI_NATIVE_TO_ADDRESSES, };

package/dist/index.js

@@ -1,4 +1,5 @@
 import { WrapTokenAddressMap, DEX_SUPPORT_CHAINS, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, } from "./list";
 import { getQuote } from "./quote";
 import { DEX_ENUM } from "./consts";
-export { WrapTokenAddressMap, DEX_ENUM, DEX_SUPPORT_CHAINS, getQuote, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, };
+import { UNI_NATIVE_TO_ADDRESSES } from "./dexs/uni";
+export { WrapTokenAddressMap, DEX_ENUM, DEX_SUPPORT_CHAINS, getQuote, DEX_ROUTER_WHITELIST, DEX_SPENDER_WHITELIST, UNI_NATIVE_TO_ADDRESSES, };

package/dist/list.d.ts

@@ -37,6 +37,7 @@ export declare const DEX_SUPPORT_CHAINS: {
     "0xAPIV2": CHAINS_ENUM[];
     Magpie: CHAINS_ENUM[];
     Rabby: CHAINS_ENUM[];
+    Uniswap: CHAINS_ENUM[];
 };
 export declare const DEX_ROUTER_WHITELIST: {
     "1inch": {
@@ -176,6 +177,19 @@ export declare const DEX_ROUTER_WHITELIST: {
     Rabby: {
         ETH: string;
     };
+    Uniswap: {
+        [x: string]: string;
+        ETH: string;
+        OP: string;
+        BSC: string;
+        POLYGON: string;
+        ARBITRUM: string;
+        AVAX: string;
+        BASE: string;
+        BLAST: string;
+        CELO: string;
+        ERA: string;
+    };
 };
 export declare const DEX_SPENDER_WHITELIST: {
     "1inch": {
@@ -316,4 +330,17 @@ export declare const DEX_SPENDER_WHITELIST: {
     Rabby: {
         ETH: string;
     };
+    Uniswap: {
+        [x: string]: string;
+        ETH: string;
+        OP: string;
+        BSC: string;
+        POLYGON: string;
+        ARBITRUM: string;
+        AVAX: string;
+        BASE: string;
+        BLAST: string;
+        CELO: string;
+        ERA: string;
+    };
 };

package/dist/list.js

@@ -10,6 +10,7 @@ import { SUPPORT_CHAINS as odosSupportChains } from "./dexs/odos";
 import { SUPPORT_CHAINS as zeroXV2SupportChains } from "./dexs/0xapi_v2";
 import { SUPPORT_CHAINS as magpieSupportChains } from "./dexs/magpie";
 import { SUPPORT_CHAINS as rabbySupportChains } from "./dexs/rabby";
+import { SUPPORT_CHAINS as uniSupportChains } from "./dexs/uni";
 import { DEX_ENUM } from "./consts";
 export const WrapTokenAddressMap = {
     [CHAINS_ENUM.ETH]: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
@@ -64,6 +65,7 @@ export const DEX_SUPPORT_CHAINS = {
     [DEX_ENUM.ZEROXAPIV2]: zeroXV2SupportChains,
     [DEX_ENUM.MAGPIE]: magpieSupportChains,
     [DEX_ENUM.RABBY]: rabbySupportChains,
+    [DEX_ENUM.UNI]: uniSupportChains,
 };
 export const DEX_ROUTER_WHITELIST = {
     [DEX_ENUM.ONEINCH]: {
@@ -231,6 +233,19 @@ export const DEX_ROUTER_WHITELIST = {
     [DEX_ENUM.RABBY]: {
         [CHAINS_ENUM.ETH]: "0x7fd9cfeef127451918c688c49e9905e47da3e985",
     },
+    [DEX_ENUM.UNI]: {
+        [CHAINS_ENUM.ETH]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.OP]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.BSC]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.POLYGON]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.ARBITRUM]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.AVAX]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.BASE]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.BLAST]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.CELO]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.ERA]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        ["UNI"]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+    },
 };
 export const DEX_SPENDER_WHITELIST = {
     [DEX_ENUM.ONEINCH]: {
@@ -399,4 +414,17 @@ export const DEX_SPENDER_WHITELIST = {
     [DEX_ENUM.RABBY]: {
         [CHAINS_ENUM.ETH]: "0x7fd9cfeef127451918c688c49e9905e47da3e985",
     },
+    [DEX_ENUM.UNI]: {
+        [CHAINS_ENUM.ETH]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.OP]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.BSC]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.POLYGON]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.ARBITRUM]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.AVAX]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.BASE]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.BLAST]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.CELO]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        [CHAINS_ENUM.ERA]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+        ["UNI"]: "0x02E5be68D46DAc0B524905bfF209cf47EE6dB2a9",
+    },
 };

package/dist/quote.js

@@ -13,13 +13,13 @@ import { getQuote as oneInchGetQuote, decodeCalldata as oneInchDecodeCalldata, }
 import { getQuote as zeroXGetQuote, decodeCalldata as zeroXDecodeCalldata, } from "./dexs/0xapi";
 import { getQuote as paraSwapGetQuote, decodeCalldata as paraSwapDecodeCalldata, } from "./dexs/paraswap";
 import { getQuote as openOceanGetQuote, decodeCalldata as openOceanDecodeCalldata, } from "./dexs/openocean";
-import { getQuote as uniswapGetQuote, decodeCalldata as uniswapDecodeCalldata, } from "./dexs/uniswap";
 import { getQuote as kyberswapGetQuote, decodeCalldata as kyberswapDecodeCalldata, } from "./dexs/kyberswap";
 import { getQuote as paraSwapV6GetQuote, decodeCalldata as paraSwapV6DecodeCalldata, } from "./dexs/paraswap_v6";
 import { getQuote as odosGetQuote, decodeCalldata as odosDecodeCalldata, } from "./dexs/odos";
 import { getQuote as zeroXV2GetQuote, decodeCalldata as zeroXV2DecodeCalldata, } from "./dexs/0xapi_v2";
 import { getQuote as magpieGetQuote, decodeCalldata as magpieDecodeCalldata, } from "./dexs/magpie";
 import { getQuote as rabbyGetQuote, decodeCalldata as rabbyDecodeCalldata, } from "./dexs/rabby";
+import { getQuote as uniGetQuote, decodeCalldata as uniDecodeCalldata, } from "./dexs/uni";
 export const getQuote = (id, params, api) => __awaiter(void 0, void 0, void 0, function* () {
     switch (id) {
         case DEX_ENUM.WRAPTOKEN:
@@ -32,8 +32,6 @@ export const getQuote = (id, params, api) => __awaiter(void 0, void 0, void 0, f
             return yield zeroXGetQuote(params, api);
         case DEX_ENUM.OPENOCEAN:
             return yield openOceanGetQuote(params, api);
-        case DEX_ENUM.UNISWAP:
-            return yield uniswapGetQuote(params, api);
         case DEX_ENUM.KYBERSWAP:
             return yield kyberswapGetQuote(params, api);
         case DEX_ENUM.PARASWAPV6:
@@ -46,6 +44,8 @@ export const getQuote = (id, params, api) => __awaiter(void 0, void 0, void 0, f
             return yield magpieGetQuote(params, api);
         case DEX_ENUM.RABBY:
             return yield rabbyGetQuote(params, api);
+        case DEX_ENUM.UNI:
+            return yield uniGetQuote(params, api);
         default:
             throw new Error(`${id} is not supported!`);
     }
@@ -60,8 +60,6 @@ export const decodeCalldata = (id, tx) => {
             return zeroXDecodeCalldata(tx);
         case DEX_ENUM.OPENOCEAN:
             return openOceanDecodeCalldata(tx);
-        case DEX_ENUM.UNISWAP:
-            return uniswapDecodeCalldata(tx);
         case DEX_ENUM.KYBERSWAP:
             return kyberswapDecodeCalldata(tx);
         case DEX_ENUM.PARASWAPV6:
@@ -74,6 +72,8 @@ export const decodeCalldata = (id, tx) => {
             return magpieDecodeCalldata(tx);
         case DEX_ENUM.RABBY:
             return rabbyDecodeCalldata(tx);
+        case DEX_ENUM.UNI:
+            return uniDecodeCalldata(tx);
         default:
             throw new Error(`${id} is not supported!`);
     }

package/dist/utils.d.ts

@@ -5,6 +5,6 @@ import { DEX_ENUM } from "./consts";
 export declare const isSameAddress: (addr1: string, addr2: string) => boolean;
 export declare const generateGetQuote: ({ SUPPORT_CHAINS, id, dex, }: {
     SUPPORT_CHAINS: CHAINS_ENUM[];
-    id: "uniswap3" | "matcha" | "matcha_v2" | "openocean" | "1inch_v6" | "paraswap" | "kyberswap" | "odos" | "paraswap_v6" | "magpie" | "rabby";
+    id: "matcha" | "matcha_v2" | "openocean" | "1inch_v6" | "paraswap" | "kyberswap" | "odos" | "paraswap_v6" | "magpie" | "rabby" | "uni";
     dex: DEX_ENUM;
 }) => (options: QuoteParams, api: OpenApiService) => Promise<QuoteResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-swap",
-  "version": "0.0.74",
+  "version": "0.0.75-beta.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/dist/dexs/uniswap.js

@@ -1,64 +0,0 @@
-import { CHAINS } from "@debank/common";
-import { Interface } from "@ethersproject/abi";
-import { generateGetQuote } from "../utils";
-import { UniswapABI } from "../abi";
-import { DEX_ENUM } from "../consts";
-/**
- * @deprecated
- */
-export const SUPPORT_CHAINS = [
-// CHAINS_ENUM.ETH,
-// CHAINS_ENUM.POLYGON,
-// CHAINS_ENUM.OP,
-// CHAINS_ENUM.ARBITRUM,
-];
-export const getQuote = generateGetQuote({
-    SUPPORT_CHAINS,
-    id: "uniswap3",
-    dex: DEX_ENUM.UNISWAP,
-});
-export const decodeCalldata = (tx) => {
-    var _a, _b, _c;
-    const chain = Object.values(CHAINS).find((item) => item.id === tx.chainId);
-    if (!chain)
-        return null;
-    const contractInterface = new Interface(UniswapABI);
-    const result = contractInterface.parseTransaction({ data: tx.data });
-    if (result.name === "multicall" && ((_b = (_a = result === null || result === void 0 ? void 0 : result.args) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.length) === 2) {
-        const data = (_c = result === null || result === void 0 ? void 0 : result.args) === null || _c === void 0 ? void 0 : _c.data;
-        if (data.startsWith("0x49404b7c")) {
-            const result = decodeCalldataExactInput(data[0]);
-            if (result) {
-                return Object.assign(Object.assign({}, result), { toToken: chain.nativeTokenAddress });
-            }
-        }
-    }
-    return decodeCalldataExactInput(tx);
-};
-function decodeCalldataExactInput(tx) {
-    const chain = Object.values(CHAINS).find((item) => item.id === tx.chainId);
-    if (!chain)
-        return null;
-    const contractInterface = new Interface(UniswapABI);
-    const result = contractInterface.parseTransaction({ data: tx.data });
-    if (result.name === "") {
-        return null;
-    }
-    const [path, recipient, dstReceiver, amount, minReturnAmount] = result.args[0];
-    let srcToken = "";
-    let dstToken = "";
-    if (!path) {
-        return null;
-    }
-    srcToken = "0x" + path.slice(2, 42);
-    dstToken = "0x" + path.slice(-40);
-    if (!srcToken || !dstToken || !recipient || !amount || !minReturnAmount)
-        return null;
-    return {
-        fromToken: srcToken,
-        fromTokenAmount: amount.toString(),
-        toToken: dstToken,
-        minReceiveToTokenAmount: minReturnAmount.toString(),
-        toTokenReceiver: dstReceiver,
-    };
-}