@orbs-network/twap 1.20.0 → 1.21.0

package/dist/src/lib.d.ts

@@ -59,6 +59,7 @@ export declare class TWAPLib {
         dstUsd: BN;
         path: string[];
     }>;
+    private solverRoute;
     findRouteForNextBid(order: Order): Promise<{
         data: string;
         srcToken: TokenData;

package/dist/src/lib.js

@@ -244,37 +244,26 @@ class TWAPLib {
     priceUsd(token) {
         return __awaiter(this, void 0, void 0, function* () {
             token = (0, web3_candies_1.isNativeAddress)(token.address) ? this.config.wToken : token;
-            try {
-                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();
-            }
-            catch (e) {
-                try {
-                    const r = yield odos_1.Odos.findRoute(this.config.chainId, token, this.config.nativeToken, (0, bignumber_js_1.default)(10).pow(token.decimals));
-                    return r.srcUsd.toNumber();
-                }
-                catch (e) {
-                    const r = yield openocean_1.OpenOcean.findRoute(this.config.chainId, token, this.config.nativeToken, (0, bignumber_js_1.default)(10).pow(token.decimals));
-                    return r.srcUsd.toNumber();
-                }
-            }
+            const r = yield this.solverRoute(token, this.config.nativeToken, (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;
-            if (this.config.exchangeType === "OdosExchange") {
-                route = yield odos_1.Odos.findRoute(this.config.chainId, srcToken, dstToken, srcAmount, this.config.exchangeAddress, this.config.pathfinderKey, this.config.partner);
-            }
-            else if (this.config.exchangeType === "OpenOceanExchange") {
-                route = yield openocean_1.OpenOcean.findRoute(this.config.chainId, srcToken, dstToken, srcAmount, this.config.exchangeAddress, this.config.pathfinderKey, this.config.partner);
-            }
-            else {
-                route = yield paraswap_1.Paraswap.findRoute(this.config.chainId, srcToken, dstToken, srcAmount, this.config.exchangeAddress, this.config.pathfinderKey, this.config.partner);
-            }
+            const route = yield this.solverRoute(srcToken, dstToken, srcAmount);
             return Object.assign(Object.assign({}, route), { data: this.encodeBidData(route), srcToken, dstToken, srcAmount });
         });
     }
+    solverRoute(srcToken, dstToken, srcAmount) {
+        switch (this.config.exchangeType) {
+            case "OdosExchange":
+                return odos_1.Odos.findRoute(this.config.chainId, srcToken, dstToken, srcAmount, this.config.exchangeAddress, this.config.pathfinderKey, this.config.partner);
+            case "OpenOceanExchange":
+                return openocean_1.OpenOcean.findRoute(this.config.chainId, srcToken, dstToken, srcAmount, this.config.exchangeAddress, this.config.pathfinderKey, this.config.partner);
+            default:
+                return paraswap_1.Paraswap.findRoute(this.config.chainId, srcToken, dstToken, srcAmount, this.config.exchangeAddress, this.config.pathfinderKey, this.config.partner);
+        }
+    }
     findRouteForNextBid(order) {
         return __awaiter(this, void 0, void 0, function* () {
             if (order.ask.exchange !== web3_candies_1.zeroAddress && !(0, web3_candies_1.eqIgnoreCase)(order.ask.exchange, this.config.exchangeAddress))

package/package.json

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