@orbs-network/twap 1.10.9 → 1.10.11

package/dist/src/configs.d.ts

@@ -1,11 +1,21 @@
-import { Paraswap } from "./paraswap";
-import { Odos } from "./odos";
 export interface TokenData {
     address: string;
     decimals: number;
     symbol: string;
     logoUrl?: string;
 }
+export declare enum ParaswapOnlyDex {
+    UniSwapV2 = "Uniswap",
+    SushiSwap = "SushiSwap",
+    QuickSwap = "QuickSwap,QuickSwapV3",
+    SpiritSwap = "SpiritSwap,SpiritSwapV2",
+    SpookySwap = "SpookySwap",
+    Pangolin = "PangolinSwap",
+    TraderJoe = "TraderJoe"
+}
+export declare enum OdosOnlyDex {
+    Chronos = "Chronos Stable,Chronos Volatile,Wrapped Ether"
+}
 export interface Config {
     chainId: number;
     chainName: string;
@@ -22,7 +32,7 @@ export interface Config {
     partner: string;
     exchangeAddress: string;
     exchangeType: "UniswapV2Exchange" | "ParaswapExchange" | "PangolinDaasExchange" | "OdosExchange";
-    pathfinderKey: Paraswap.OnlyDex | Odos.OnlyDex;
+    pathfinderKey: ParaswapOnlyDex | OdosOnlyDex;
 }
 export declare const ChainConfigs: {
     eth: {
@@ -1109,8 +1119,6 @@ export declare const Configs: {
     QuickSwap: Config;
     Chronos: Config;
 };
-export declare const nativeTokenAddresses: string[];
-export declare const isNativeAddress: (address: string) => boolean;
 export declare const chainConfig: (chainId: number) => {
     twapAbi: ({
         inputs: {

package/dist/src/configs.js

@@ -3,15 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chainConfig = exports.isNativeAddress = exports.nativeTokenAddresses = exports.Configs = exports.ChainConfigs = void 0;
+exports.chainConfig = exports.Configs = exports.ChainConfigs = exports.OdosOnlyDex = exports.ParaswapOnlyDex = void 0;
 const web3_candies_1 = require("@defi.org/web3-candies");
 const lodash_1 = __importDefault(require("lodash"));
-const paraswap_1 = require("./paraswap");
 const TWAP_json_1 = __importDefault(require("../artifacts/contracts/TWAP.sol/TWAP.json"));
 const Lens_json_1 = __importDefault(require("../artifacts/contracts/periphery/Lens.sol/Lens.json"));
 const Taker_json_1 = __importDefault(require("../artifacts/contracts/periphery/Taker.sol/Taker.json"));
 const legacy_abi_1 = require("./legacy-abi");
-const odos_1 = require("./odos");
+var ParaswapOnlyDex;
+(function (ParaswapOnlyDex) {
+    ParaswapOnlyDex["UniSwapV2"] = "Uniswap";
+    ParaswapOnlyDex["SushiSwap"] = "SushiSwap";
+    ParaswapOnlyDex["QuickSwap"] = "QuickSwap,QuickSwapV3";
+    ParaswapOnlyDex["SpiritSwap"] = "SpiritSwap,SpiritSwapV2";
+    ParaswapOnlyDex["SpookySwap"] = "SpookySwap";
+    ParaswapOnlyDex["Pangolin"] = "PangolinSwap";
+    ParaswapOnlyDex["TraderJoe"] = "TraderJoe";
+})(ParaswapOnlyDex = exports.ParaswapOnlyDex || (exports.ParaswapOnlyDex = {}));
+var OdosOnlyDex;
+(function (OdosOnlyDex) {
+    OdosOnlyDex["Chronos"] = "Chronos Stable,Chronos Volatile,Wrapped Ether";
+})(OdosOnlyDex = exports.OdosOnlyDex || (exports.OdosOnlyDex = {}));
 const defaultAbis = {
     twapAbi: TWAP_json_1.default.abi,
     lensAbi: Lens_json_1.default.abi,
@@ -88,20 +100,12 @@ exports.ChainConfigs = {
         } }, defaultAbis),
 };
 exports.Configs = {
-    SpiritSwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpiritSwap", exchangeAddress: "0xAd19179201be5A51D1cBd3bB2fC651BB05822404", exchangeType: "ParaswapExchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpiritSwap }),
-    SpookySwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpookySwap", exchangeAddress: "0x4b5815D263549Ff9b54a3838693C3DC0dbE7e597", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpookySwap }),
-    Pangolin: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "Pangolin", exchangeAddress: "0xf2d96E7BE676153d202e1453804E2749923C7c5b", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
-    PangolinDaas: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "PangolinDaas", exchangeAddress: "0x1579EED0527781B1A748043AA1f59a3858Ace4a7", exchangeType: "PangolinDaasExchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
-    QuickSwap: Object.assign(Object.assign({}, exports.ChainConfigs.poly), { partner: "QuickSwap", exchangeAddress: "0x26D0ec4Be402BCE03AAa8aAf0CF67e9428ba54eF", exchangeType: "ParaswapExchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.QuickSwap }),
-    Chronos: Object.assign(Object.assign({}, exports.ChainConfigs.arb), { partner: "Chronos", exchangeAddress: "0xA0b07F9a11dFb01388149abBdbc5B4f2196600AB", exchangeType: "OdosExchange", pathfinderKey: odos_1.Odos.OnlyDex.Chronos }),
+    SpiritSwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpiritSwap", exchangeAddress: "0xAd19179201be5A51D1cBd3bB2fC651BB05822404", exchangeType: "ParaswapExchange", pathfinderKey: ParaswapOnlyDex.SpiritSwap }),
+    SpookySwap: Object.assign(Object.assign({}, exports.ChainConfigs.ftm), { partner: "SpookySwap", exchangeAddress: "0x4b5815D263549Ff9b54a3838693C3DC0dbE7e597", exchangeType: "UniswapV2Exchange", pathfinderKey: ParaswapOnlyDex.SpookySwap }),
+    Pangolin: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "Pangolin", exchangeAddress: "0xf2d96E7BE676153d202e1453804E2749923C7c5b", exchangeType: "UniswapV2Exchange", pathfinderKey: ParaswapOnlyDex.Pangolin }),
+    PangolinDaas: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "PangolinDaas", exchangeAddress: "0x1579EED0527781B1A748043AA1f59a3858Ace4a7", exchangeType: "PangolinDaasExchange", pathfinderKey: ParaswapOnlyDex.Pangolin }),
+    QuickSwap: Object.assign(Object.assign({}, exports.ChainConfigs.poly), { partner: "QuickSwap", exchangeAddress: "0x26D0ec4Be402BCE03AAa8aAf0CF67e9428ba54eF", exchangeType: "ParaswapExchange", pathfinderKey: ParaswapOnlyDex.QuickSwap }),
+    Chronos: Object.assign(Object.assign({}, exports.ChainConfigs.arb), { partner: "Chronos", exchangeAddress: "0xA0b07F9a11dFb01388149abBdbc5B4f2196600AB", exchangeType: "OdosExchange", pathfinderKey: OdosOnlyDex.Chronos }),
 };
-exports.nativeTokenAddresses = [
-    web3_candies_1.zeroAddress,
-    "0x0000000000000000000000000000000000001010",
-    "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-    "0x000000000000000000000000000000000000dEaD",
-];
-const isNativeAddress = (address) => !!lodash_1.default.find(exports.nativeTokenAddresses, (a) => (0, web3_candies_1.eqIgnoreCase)(a, address));
-exports.isNativeAddress = isNativeAddress;
 const chainConfig = (chainId) => lodash_1.default.find(exports.ChainConfigs, (c) => c.chainId === chainId);
 exports.chainConfig = chainConfig;

package/dist/src/lib.d.ts

@@ -1,5 +1,6 @@
-import { Config, TokenData } from "./configs";
+import { Config } from "./configs";
 import BN from "bignumber.js";
+import { TokenData } from "@defi.org/web3-candies";
 import type { TWAP } from "../typechain-hardhat/contracts";
 import type { Lens } from "../typechain-hardhat/contracts/periphery";
 import { Paraswap } from "./paraswap";
@@ -43,11 +44,12 @@ export declare class TWAPLib {
     cancelOrder(id: number, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
     getAllOrders(): Promise<Order[]>;
     getAllOrdersWithTokens(): Promise<(Order & {
-        srcToken: TokenData;
-        dstToken: TokenData;
+        srcToken: import("./configs").TokenData;
+        dstToken: import("./configs").TokenData;
     })[]>;
     parseOrder(r: any): Order;
-    getToken(address: string): Promise<TokenData>;
+    getToken(address: string): Promise<import("./configs").TokenData>;
+    priceUsd(token: TokenData): Promise<number>;
     findRoute(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value): Promise<{
         data: string;
         srcToken: TokenData;

package/dist/src/lib.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokensValidation = exports.OrderInputValidation = exports.Status = exports.TWAPLib = void 0;
-const configs_1 = require("./configs");
 const web3_1 = __importDefault(require("web3"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const web3_candies_1 = require("@defi.org/web3-candies");
@@ -26,7 +25,7 @@ class TWAPLib {
         this.maker = maker;
         this.provider = provider;
         this.dstAmount = (srcToken, dstToken, srcAmount, srcUsdMarket, dstUsdMarket, limitDstPriceFor1Src, isMarketOrder) => (0, web3_candies_1.convertDecimals)(isMarketOrder ? (0, bignumber_js_1.default)(srcAmount).times(srcUsdMarket).div(dstUsdMarket) : (0, bignumber_js_1.default)(srcAmount).times(limitDstPriceFor1Src), srcToken.decimals, dstToken.decimals).integerValue(bignumber_js_1.default.ROUND_FLOOR);
-        this.isNativeToken = (token) => (0, configs_1.isNativeAddress)(token.address);
+        this.isNativeToken = (token) => (0, web3_candies_1.isNativeAddress)(token.address);
         this.isWrappedToken = (token) => (0, web3_candies_1.eqIgnoreCase)(token.address, this.config.wToken.address);
         this.isValidChain = (chainId) => chainId === this.config.chainId;
         this.maxPossibleChunks = (srcToken, srcAmount, srcUsd) => bignumber_js_1.default.max(1, (0, bignumber_js_1.default)(srcAmount).div((0, bignumber_js_1.default)(10).pow(srcToken.decimals).div(srcUsd).times(this.config.minChunkSizeUsd)))
@@ -231,7 +230,7 @@ class TWAPLib {
     }
     getToken(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            if ((0, configs_1.isNativeAddress)(address))
+            if ((0, web3_candies_1.isNativeAddress)(address))
                 return this.config.nativeToken;
             if ((0, web3_candies_1.eqIgnoreCase)(address, this.config.wToken.address))
                 return this.config.wToken;
@@ -241,6 +240,13 @@ class TWAPLib {
             return { address, decimals, symbol };
         });
     }
+    priceUsd(token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            token = (0, web3_candies_1.isNativeAddress)(token.address) ? this.config.wToken : token;
+            const r = yield paraswap_1.Paraswap.findRoute(this.config.chainId, token, { address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", symbol: "NATIVE", decimals: 18 }, (0, bignumber_js_1.default)(10).pow(token.decimals));
+            return r.srcUsd.toNumber();
+        });
+    }
     findRoute(srcToken, dstToken, srcAmount) {
         return __awaiter(this, void 0, void 0, function* () {
             let route;

package/dist/src/odos.d.ts

@@ -1,9 +1,6 @@
-import { BN } from "@defi.org/web3-candies";
-import { TokenData } from "./configs";
+import { BN, TokenData } from "@defi.org/web3-candies";
+import { OdosOnlyDex } from "./configs";
 export declare namespace Odos {
-    enum OnlyDex {
-        Chronos = "Chronos Stable,Chronos Volatile,Wrapped Ether"
-    }
     interface Route {
         dstAmount: BN;
         srcUsd: BN;
@@ -12,5 +9,5 @@ export declare namespace Odos {
         path: string[];
     }
     function priceUsd(chainId: number, token: TokenData): Promise<BN>;
-    function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, exchangeAdapter?: string, onlyDex?: OnlyDex): Promise<Route>;
+    function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, exchangeAdapter?: string, onlyDex?: OdosOnlyDex): Promise<Route>;
 }

package/dist/src/odos.js

@@ -15,13 +15,9 @@ const configs_1 = require("./configs");
 var Odos;
 (function (Odos) {
     const URL = "https://api.odos.xyz";
-    let OnlyDex;
-    (function (OnlyDex) {
-        OnlyDex["Chronos"] = "Chronos Stable,Chronos Volatile,Wrapped Ether";
-    })(OnlyDex = Odos.OnlyDex || (Odos.OnlyDex = {}));
     function priceUsd(chainId, token) {
         return __awaiter(this, void 0, void 0, function* () {
-            token = (0, configs_1.isNativeAddress)(token.address) ? (0, configs_1.chainConfig)(chainId).wToken : token;
+            token = (0, web3_candies_1.isNativeAddress)(token.address) ? (0, configs_1.chainConfig)(chainId).wToken : token;
             const r = yield findRoute(chainId, token, (0, configs_1.chainConfig)(chainId).nativeToken, (0, web3_candies_1.BN)(10).pow(token.decimals));
             return r.srcUsd;
         });

package/dist/src/paraswap.d.ts

@@ -1,15 +1,7 @@
+import { TokenData } from "@defi.org/web3-candies";
 import BN from "bignumber.js";
-import { TokenData } from "./configs";
+import { ParaswapOnlyDex } from "./configs";
 export declare namespace Paraswap {
-    enum OnlyDex {
-        UniSwapV2 = "Uniswap",
-        SushiSwap = "SushiSwap",
-        QuickSwap = "QuickSwap,QuickSwapV3",
-        SpiritSwap = "SpiritSwap,SpiritSwapV2",
-        SpookySwap = "SpookySwap",
-        Pangolin = "PangolinSwap",
-        TraderJoe = "TraderJoe"
-    }
     interface Route {
         dstAmount: BN;
         srcUsd: BN;
@@ -17,6 +9,5 @@ export declare namespace Paraswap {
         data: string;
         path: string[];
     }
-    function priceUsd(chainId: number, token: TokenData): Promise<BN>;
-    function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, exchangeAdapter?: string, onlyDex?: OnlyDex): Promise<Route>;
+    function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, exchangeAdapter?: string, onlyDex?: ParaswapOnlyDex): Promise<Route>;
 }

package/dist/src/paraswap.js

@@ -13,31 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Paraswap = void 0;
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const web3_candies_1 = require("@defi.org/web3-candies");
-const configs_1 = require("./configs");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const lodash_1 = __importDefault(require("lodash"));
 var Paraswap;
 (function (Paraswap) {
     const URL = "https://apiv5.paraswap.io";
-    let OnlyDex;
-    (function (OnlyDex) {
-        OnlyDex["UniSwapV2"] = "Uniswap";
-        OnlyDex["SushiSwap"] = "SushiSwap";
-        OnlyDex["QuickSwap"] = "QuickSwap,QuickSwapV3";
-        OnlyDex["SpiritSwap"] = "SpiritSwap,SpiritSwapV2";
-        OnlyDex["SpookySwap"] = "SpookySwap";
-        OnlyDex["Pangolin"] = "PangolinSwap";
-        OnlyDex["TraderJoe"] = "TraderJoe";
-    })(OnlyDex = Paraswap.OnlyDex || (Paraswap.OnlyDex = {}));
-    function priceUsd(chainId, token) {
-        return __awaiter(this, void 0, void 0, function* () {
-            token = (0, configs_1.isNativeAddress)(token.address) ? (0, configs_1.chainConfig)(chainId).wToken : token;
-            const r = yield findRoute(chainId, token, { address: configs_1.nativeTokenAddresses[2], symbol: "NATIVE", decimals: 18 }, (0, bignumber_js_1.default)(10).pow(token.decimals));
-            return r.srcUsd;
-        });
-    }
-    Paraswap.priceUsd = priceUsd;
     function findRoute(chainId, src, dst, amountIn, exchangeAdapter = web3_candies_1.zeroAddress, onlyDex) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -60,9 +41,13 @@ var Paraswap;
             const path = getDirectPath(route, onlyDex);
             let data = "";
             try {
-                data = yield buildSwapData(route, exchangeAdapter);
+                if (exchangeAdapter !== web3_candies_1.zeroAddress) {
+                    data = yield buildSwapData(route, exchangeAdapter);
+                }
+            }
+            catch (e) {
+                console.error(e);
             }
-            catch (e) { }
             return { dstAmount: (0, bignumber_js_1.default)(route.destAmount), srcUsd: (0, bignumber_js_1.default)(route.srcUSD), dstUsd: (0, bignumber_js_1.default)(route.destUSD), data, path };
         });
     }
@@ -88,9 +73,7 @@ var Paraswap;
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield fetch(`${URL}/transactions/${paraswapRoute.network}?ignoreChecks=true`, {
                 method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
+                headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({
                     priceRoute: paraswapRoute,
                     srcToken: paraswapRoute.srcToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbs-network/twap",
-  "version": "1.10.9",
+  "version": "1.10.11",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/orbs-network/twap.git"