@rabby-wallet/rabby-swap 0.0.24 → 0.0.26

package/dist/abi.d.ts

@@ -142,3 +142,37 @@ 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;
+})[];

package/dist/abi.js

@@ -764,3 +764,88 @@ 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",
+    },
+];

package/dist/consts.d.ts

@@ -4,7 +4,8 @@ export declare enum DEX_ENUM {
     PARASWAP = "ParaSwap",
     ZEROXAPI = "0xAPI",
     WRAPTOKEN = "WrapToken",
-    OPENOCEAN = "OpenOcean"
+    OPENOCEAN = "OpenOcean",
+    UNISWAP = "Uniswap"
 }
 export declare const WrapTokenAddressMap: {
     ETH: string;
@@ -23,6 +24,7 @@ export declare const DEX_SUPPORT_CHAINS: {
     ParaSwap: CHAINS_ENUM[];
     "0xAPI": CHAINS_ENUM[];
     OpenOcean: CHAINS_ENUM[];
+    Uniswap: CHAINS_ENUM[];
 };
 export declare const DEX_ROUTER_WHITELIST: {
     "1inch": {
@@ -71,6 +73,13 @@ export declare const DEX_ROUTER_WHITELIST: {
         KAVA: string;
         METIS: string;
     };
+    Uniswap: {
+        ETH: string;
+        POLYGON: string;
+        BSC: string;
+        OP: string;
+        ARBITRUM: string;
+    };
 };
 export declare const DEX_SPENDER_WHITELIST: {
     "1inch": {
@@ -119,4 +128,11 @@ export declare const DEX_SPENDER_WHITELIST: {
         KAVA: string;
         METIS: string;
     };
+    Uniswap: {
+        ETH: string;
+        POLYGON: string;
+        BSC: string;
+        OP: string;
+        ARBITRUM: string;
+    };
 };

package/dist/consts.js

@@ -4,6 +4,7 @@ import { SUPPORT_CHAINS as zeroXSupportChains } from "./dexs/0xapi";
 import { SUPPORT_CHAINS as oneInchSupportChains } from "./dexs/1inch";
 import { SUPPORT_CHAINS as paraswapSupportChains } from "./dexs/paraswap";
 import { SUPPORT_CHAINS as openOceanSupportChains } from "./dexs/openocean";
+import { SUPPORT_CHAINS as uniswapSupportChains } from "./dexs/uniswap";
 export var DEX_ENUM;
 (function (DEX_ENUM) {
     DEX_ENUM["ONEINCH"] = "1inch";
@@ -11,6 +12,7 @@ export var DEX_ENUM;
     DEX_ENUM["ZEROXAPI"] = "0xAPI";
     DEX_ENUM["WRAPTOKEN"] = "WrapToken";
     DEX_ENUM["OPENOCEAN"] = "OpenOcean";
+    DEX_ENUM["UNISWAP"] = "Uniswap";
 })(DEX_ENUM || (DEX_ENUM = {}));
 export const WrapTokenAddressMap = {
     [CHAINS_ENUM.ETH]: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
@@ -29,6 +31,7 @@ export const DEX_SUPPORT_CHAINS = {
     [DEX_ENUM.PARASWAP]: paraswapSupportChains,
     [DEX_ENUM.ZEROXAPI]: zeroXSupportChains,
     [DEX_ENUM.OPENOCEAN]: openOceanSupportChains,
+    [DEX_ENUM.UNISWAP]: uniswapSupportChains,
 };
 export const DEX_ROUTER_WHITELIST = {
     [DEX_ENUM.ONEINCH]: {
@@ -77,6 +80,13 @@ export const DEX_ROUTER_WHITELIST = {
         [CHAINS_ENUM.KAVA]: "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
         [CHAINS_ENUM.METIS]: "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     },
+    [DEX_ENUM.UNISWAP]: {
+        [CHAINS_ENUM.ETH]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.POLYGON]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.BSC]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.OP]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.ARBITRUM]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+    },
 };
 export const DEX_SPENDER_WHITELIST = {
     [DEX_ENUM.ONEINCH]: {
@@ -125,4 +135,11 @@ export const DEX_SPENDER_WHITELIST = {
         [CHAINS_ENUM.KAVA]: "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
         [CHAINS_ENUM.METIS]: "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64",
     },
+    [DEX_ENUM.UNISWAP]: {
+        [CHAINS_ENUM.ETH]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.POLYGON]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.BSC]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.OP]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+        [CHAINS_ENUM.ARBITRUM]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+    },
 };

package/dist/dexs/0xapi.d.ts

@@ -1,5 +1,5 @@
 import { CHAINS_ENUM } from "@debank/common";
-import { QuoteParams, QuoteResult, TxWithChainId, DecodeCalldataResult } from "../quote";
+import { TxWithChainId, DecodeCalldataResult } from "../quote";
 export declare const SUPPORT_CHAINS: CHAINS_ENUM[];
-export declare const getQuote: (options: QuoteParams) => Promise<QuoteResult>;
+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/0xapi.js

@@ -1,28 +1,8 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import axios from "axios";
 import { Interface } from "@ethersproject/abi";
 import { CHAINS_ENUM, CHAINS } from "@debank/common";
-import { isSameAddress } from "../utils";
+import { generateGetQuote, isSameAddress } from "../utils";
 import { ZeroXABI } from "../abi";
 const NATIVE_TOKEN = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
-const API_DOMAINS = {
-    [CHAINS_ENUM.ETH]: "https://api.0x.org",
-    [CHAINS_ENUM.POLYGON]: "https://polygon.api.0x.org",
-    [CHAINS_ENUM.BSC]: "https://bsc.api.0x.org",
-    [CHAINS_ENUM.OP]: "https://optimism.api.0x.org",
-    [CHAINS_ENUM.FTM]: "https://fantom.api.0x.org",
-    [CHAINS_ENUM.CELO]: "https://celo.api.0x.org",
-    [CHAINS_ENUM.AVAX]: "https://avalanche.api.0x.org",
-    [CHAINS_ENUM.ARBITRUM]: "https://arbitrum.api.0x.org",
-};
 export const SUPPORT_CHAINS = [
     CHAINS_ENUM.ETH,
     CHAINS_ENUM.POLYGON,
@@ -33,70 +13,10 @@ export const SUPPORT_CHAINS = [
     CHAINS_ENUM.ARBITRUM,
     CHAINS_ENUM.CELO,
 ];
-export const getQuote = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!SUPPORT_CHAINS.includes(options.chain)) {
-        throw new Error(`${CHAINS[options.chain]} is not support on 1inch`);
-    }
-    const baseURL = API_DOMAINS[options.chain];
-    const request = axios.create({
-        baseURL,
-    });
-    request.interceptors.response.use((response) => {
-        var _a, _b;
-        const code = (_a = response.data) === null || _a === void 0 ? void 0 : _a.code;
-        const msg = (_b = response.data) === null || _b === void 0 ? void 0 : _b.reason;
-        if (code && code !== 200) {
-            if (msg) {
-                let err;
-                try {
-                    err = new Error(JSON.parse(msg));
-                }
-                catch (e) {
-                    err = new Error(msg);
-                }
-                throw err;
-            }
-            throw new Error(response.data);
-        }
-        return response;
-    });
-    const params = {
-        sellToken: options.fromToken === CHAINS[options.chain].nativeTokenAddress
-            ? NATIVE_TOKEN
-            : options.fromToken,
-        buyToken: options.toToken === CHAINS[options.chain].nativeTokenAddress
-            ? NATIVE_TOKEN
-            : options.toToken,
-        sellAmount: options.amount,
-        takerAddress: options.userAddress,
-        slippagePercentage: options.slippage / 100,
-        skipValidation: true,
-    };
-    if (options.feeRate !== null && options.feeRate !== undefined) {
-        params.buyTokenPercentageFee = options.feeRate / 100;
-        params.feeRecipient = options.feeAddress;
-        params.affiliateAddress = options.feeAddress;
-    }
-    const { data } = yield request.get("/swap/v1/quote", {
-        params,
-    });
-    return {
-        tx: {
-            data: data.data,
-            to: data.to,
-            value: data.value,
-            from: data.from,
-        },
-        fromToken: isSameAddress(data.sellTokenAddress, NATIVE_TOKEN)
-            ? CHAINS[options.chain].nativeTokenAddress
-            : data.sellTokenAddress,
-        spender: data.allowanceTarget,
-        fromTokenAmount: data.sellAmount,
-        toToken: isSameAddress(data.buyTokenAddress, NATIVE_TOKEN)
-            ? CHAINS[options.chain].nativeTokenAddress
-            : data.buyTokenAddress,
-        toTokenAmount: data.buyAmount,
-    };
+export const getQuote = generateGetQuote({
+    SUPPORT_CHAINS,
+    id: "matcha",
+    dex: "0x",
 });
 export const decodeCalldata = (tx) => {
     const chain = Object.values(CHAINS).find((item) => item.id === tx.chainId);

package/dist/dexs/uniswap.d.ts

@@ -0,0 +1,5 @@
+import { CHAINS_ENUM } from "@debank/common";
+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/uniswap.js

@@ -0,0 +1,60 @@
+import { CHAINS_ENUM, CHAINS } from "@debank/common";
+import { Interface } from "@ethersproject/abi";
+import { generateGetQuote } from "../utils";
+import { UniswapABI } from "../abi";
+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: "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,
+    };
+}

package/dist/quote.d.ts

@@ -1,4 +1,5 @@
 import { CHAINS_ENUM } from "@debank/common";
+import { OpenApiService } from "@rabby-wallet/rabby-api";
 import { DEX_ENUM } from "./consts";
 export interface QuoteParams {
     fromToken: string;
@@ -34,7 +35,7 @@ export interface QuoteResult {
     toTokenAmount: string;
     spender: string;
 }
-export declare const getQuote: (id: DEX_ENUM, params: QuoteParams) => Promise<QuoteResult>;
+export declare const getQuote: (id: DEX_ENUM, params: QuoteParams, api: OpenApiService) => Promise<QuoteResult>;
 export interface DecodeCalldataResult {
     fromToken: string;
     fromTokenAmount: string;

package/dist/quote.js

@@ -13,7 +13,8 @@ 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";
-export const getQuote = (id, params) => __awaiter(void 0, void 0, void 0, function* () {
+import { getQuote as uniswapGetQuote, decodeCalldata as uniswapDecodeCalldata, } from "./dexs/uniswap";
+export const getQuote = (id, params, api) => __awaiter(void 0, void 0, void 0, function* () {
     switch (id) {
         case DEX_ENUM.WRAPTOKEN:
             return yield wrapTokenGetQuote(params);
@@ -22,9 +23,11 @@ export const getQuote = (id, params) => __awaiter(void 0, void 0, void 0, functi
         case DEX_ENUM.PARASWAP:
             return yield paraSwapGetQuote(params);
         case DEX_ENUM.ZEROXAPI:
-            return yield zeroXGetQuote(params);
+            return yield zeroXGetQuote(params, api);
         case DEX_ENUM.OPENOCEAN:
             return yield openOceanGetQuote(params);
+        case DEX_ENUM.UNISWAP:
+            return yield uniswapGetQuote(params, api);
         default:
             throw new Error(`${id} is not supported!`);
     }
@@ -39,6 +42,8 @@ export const decodeCalldata = (id, tx) => {
             return zeroXDecodeCalldata(tx);
         case DEX_ENUM.OPENOCEAN:
             return openOceanDecodeCalldata(tx);
+        case DEX_ENUM.UNISWAP:
+            return uniswapDecodeCalldata(tx);
         default:
             throw new Error(`${id} is not supported!`);
     }

package/dist/utils.d.ts

@@ -1 +1,9 @@
+import { OpenApiService } from "@rabby-wallet/rabby-api";
+import { CHAINS_ENUM } from "@debank/common";
+import { QuoteParams, QuoteResult } from "./quote";
 export declare const isSameAddress: (addr1: string, addr2: string) => boolean;
+export declare const generateGetQuote: ({ SUPPORT_CHAINS, id, dex, }: {
+    SUPPORT_CHAINS: CHAINS_ENUM[];
+    id: string;
+    dex: string;
+}) => (options: QuoteParams, api: OpenApiService) => Promise<QuoteResult>;

package/dist/utils.js

@@ -1,5 +1,47 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { CHAINS, CHAINS_ENUM } from "@debank/common";
 export const isSameAddress = (addr1, addr2) => {
-    if (typeof addr1 !== 'string' || typeof addr2 !== 'string')
+    if (typeof addr1 !== "string" || typeof addr2 !== "string")
         return false;
     return addr1.toLowerCase() === addr2.toLowerCase();
 };
+export const generateGetQuote = ({ SUPPORT_CHAINS, id, dex, }) => (options, api) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!SUPPORT_CHAINS.includes(options.chain)) {
+        throw new Error(`${CHAINS[options.chain]} is not support on ${dex}`);
+    }
+    const data = yield api.getSwapQuote({
+        id: options.userAddress,
+        chain_id: CHAINS[options.chain].serverId,
+        dex_id: options.chain === CHAINS_ENUM.ETH
+            ? id
+            : `${CHAINS[options.chain].serverId}_${id}`,
+        pay_token_id: options.fromToken,
+        pay_token_raw_amount: options.amount,
+        receive_token_id: options.toToken,
+        slippage: options.slippage / 100,
+    });
+    const isNativeToken = isSameAddress(data.pay_token.id, CHAINS[options.chain].nativeTokenAddress);
+    return {
+        tx: {
+            data: data.dex_swap_calldata,
+            value: isNativeToken ? options.amount : "0",
+            to: data.dex_swap_to,
+            from: options.userAddress,
+        },
+        fromToken: data.pay_token.id,
+        fromTokenAmount: options.amount,
+        fromTokenDecimals: data.pay_token.decimals,
+        toToken: data.receive_token.id,
+        toTokenAmount: data.receive_token_raw_amount + "",
+        toTokenDecimals: data.receive_token.decimals,
+        spender: data.dex_swap_to,
+    };
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-swap",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -24,6 +24,8 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.19.1",
+    "@debank/common": "^0.3.5",
+    "@rabby-wallet/rabby-api": "^0.6.13",
     "@types/jest": "^29.0.3",
     "@types/node": "^18.7.18",
     "axios-mock-adapter": "^1.21.2",
@@ -36,7 +38,8 @@
     "typescript": "^4.8.3"
   },
   "peerDependencies": {
-    "@debank/common": "^0.3.5"
+    "@debank/common": "^0.3.5",
+    "@rabby-wallet/rabby-api": "^0.6.13"
   },
   "author": "vvvvvv1vvvvvv",
   "license": "ISC",
@@ -44,4 +47,4 @@
     "url": "https://github.com/RabbyHub/rabby-swap/issues"
   },
   "homepage": "https://github.com/RabbyHub/rabby-swap#readme"
-}
+}