@orbs-network/twap 1.7.14 → 1.8.0

package/dist/src/configs.js

@@ -63,20 +63,10 @@ exports.ChainConfigs = {
 };
 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: "0x37F427DA0D12Fe2C80aCa09EE08e7e92A1B2B114", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.SpookySwap }),
-    Pangolin: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "Pangolin", exchangeAddress: "0x25a0A78f5ad07b2474D3D42F1c1432178465936d", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
-    QuickSwap: Object.assign(Object.assign({}, exports.ChainConfigs.poly), { partner: "QuickSwap", exchangeAddress: "0xeFE1B6096838949156e5130604434A2a13c68C68", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.QuickSwap }),
+    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: "0x72a18A408e329E7052d08aA0746243Dc30Ad2530", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
+    QuickSwap: Object.assign(Object.assign({}, exports.ChainConfigs.poly), { partner: "QuickSwap", exchangeAddress: "0x9369D5465d6D90AA3c06Af5B683e617EeA9078E4", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.QuickSwap }),
 };
-// export const UniswapV2Config: Config = {
-//   ...ChainConfigs.eth,
-//   partner: "UniswapV2",
-//   exchangeAddress: "0xE83df5BfA9F14a84e550c38c4ec505cB22C6A0d7",
-// };
-// export const SushiSwapConfig: Config = {
-//   ...ChainConfigs.eth,
-//   partner: "SushiSwap",
-//   exchangeAddress: "0x72a18A408e329E7052d08aA0746243Dc30Ad2530",
-// };
 exports.nativeTokenAddresses = [
     web3_candies_1.zeroAddress,
     "0x0000000000000000000000000000000000001010",

package/dist/src/lib.d.ts

@@ -39,12 +39,12 @@ export declare class TWAPLib {
     getAllOrders(): Promise<Order[]>;
     parseOrder(r: any): Order;
     getToken(address: string): Promise<TokenData>;
-    getSwapData(orderId: number): Promise<{
+    findSwapDataForBid(orderId: number): Promise<{
         srcToken: TokenData;
         dstToken: TokenData;
         srcAmountIn: BN;
         dstAmountOut: BN;
-        path: any;
+        raw: any;
         data: string;
     }>;
 }

package/dist/src/lib.js

@@ -203,31 +203,32 @@ class TWAPLib {
     }
     getToken(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            if ((0, configs_1.isNativeAddress)(address))
+            if ((0, configs_1.isNativeAddress)(address) || (0, web3_candies_1.eqIgnoreCase)(address, this.config.wToken.address))
                 return this.config.wToken;
             const t = (0, web3_candies_1.erc20)("", address);
             return { address, decimals: yield t.decimals(), symbol: yield t.methods.symbol().call() };
         });
     }
-    //TODO
-    getSwapData(orderId) {
+    findSwapDataForBid(orderId) {
         return __awaiter(this, void 0, void 0, function* () {
             const order = yield this.getOrder(orderId);
-            const srcAmountIn = order.ask.srcBidAmount;
-            const srcToken = yield this.getToken(order.ask.srcToken);
-            const dstToken = yield this.getToken(order.ask.dstToken);
-            const paraswapRoute = yield paraswap_1.Paraswap.findRoute(this.config.chainId, srcToken, dstToken, srcAmountIn, this.config.pathfinderKey);
-            const dstAmountOut = (0, bignumber_js_1.default)(paraswapRoute.destAmount);
-            const path = paraswap_1.Paraswap.directPath(paraswapRoute, this.config.pathfinderKey);
+            const srcAmountIn = bignumber_js_1.default.min(order.ask.srcBidAmount, order.ask.srcAmount.minus(order.srcFilledAmount));
+            const [srcToken, dstToken] = yield Promise.all([
+                this.getToken(order.ask.srcToken),
+                this.getToken(order.ask.dstToken),
+            ]);
+            const route = yield paraswap_1.Paraswap.findRoute(this.config.chainId, srcToken, dstToken, srcAmountIn, this.config.pathfinderKey);
+            const dstAmountOut = (0, bignumber_js_1.default)(route.destAmount);
             switch (this.config.exchangeType) {
                 case "UniswapV2Exchange":
+                    const path = paraswap_1.Paraswap.getDirectPath(route, this.config.pathfinderKey);
                     return {
                         srcToken,
                         dstToken,
                         srcAmountIn,
                         dstAmountOut,
-                        path,
-                        data: (0, web3_candies_1.web3)().eth.abi.encodeParameters(["bool", "address[]"], [false, path]),
+                        raw: path,
+                        data: (0, web3_candies_1.web3)().eth.abi.encodeParameters(["bool", "address[]"], [true, path]),
                     };
                 case "ParaswapExchange":
                     return {
@@ -235,8 +236,8 @@ class TWAPLib {
                         dstToken,
                         srcAmountIn,
                         dstAmountOut,
-                        path,
-                        data: yield paraswap_1.Paraswap.buildSwapData(paraswapRoute, this.config.twapAddress),
+                        raw: route,
+                        data: yield paraswap_1.Paraswap.buildSwapData(route, this.config.twapAddress),
                     };
                 default:
                     throw new Error(`unhandled exchange ${this.config.exchangeType}`);

package/dist/src/paraswap.d.ts

@@ -7,7 +7,7 @@ export declare namespace Paraswap {
         QuickSwap = "QuickSwap",
         SpiritSwap = "SpiritSwap,SpiritSwapV2",
         SpookySwap = "SpookySwap",
-        Pangolin = "PangolinDEX",
+        Pangolin = "PangolinSwap",
         TraderJoe = "TraderJoe"
     }
     interface ParaswapRoute {
@@ -39,7 +39,7 @@ export declare namespace Paraswap {
         instant: BN;
     }>;
     function priceUsd(chainId: number, token: TokenData): Promise<BN>;
-    function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, onlyDex?: OnlyDex): Promise<ParaswapRoute>;
-    function directPath(route: ParaswapRoute, onlyDex: OnlyDex): any;
+    function findRoute(chainId: number, src: TokenData, dst: TokenData, amountIn: BN.Value, onlyDex?: OnlyDex, otherExchanges?: boolean): Promise<ParaswapRoute>;
+    function getDirectPath(route: ParaswapRoute, onlyDex: OnlyDex): string[];
     function buildSwapData(paraswapRoute: ParaswapRoute, exchangeAdapter: string): Promise<string>;
 }

package/dist/src/paraswap.js

@@ -16,6 +16,7 @@ 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 lodash_1 = __importDefault(require("lodash"));
 var Paraswap;
 (function (Paraswap) {
     const URL = "https://apiv5.paraswap.io";
@@ -26,7 +27,7 @@ var Paraswap;
         OnlyDex["QuickSwap"] = "QuickSwap";
         OnlyDex["SpiritSwap"] = "SpiritSwap,SpiritSwapV2";
         OnlyDex["SpookySwap"] = "SpookySwap";
-        OnlyDex["Pangolin"] = "PangolinDEX";
+        OnlyDex["Pangolin"] = "PangolinSwap";
         OnlyDex["TraderJoe"] = "TraderJoe";
     })(OnlyDex = Paraswap.OnlyDex || (Paraswap.OnlyDex = {}));
     function gasPrices(chainId) {
@@ -52,7 +53,7 @@ var Paraswap;
         });
     }
     Paraswap.priceUsd = priceUsd;
-    function findRoute(chainId, src, dst, amountIn, onlyDex) {
+    function findRoute(chainId, src, dst, amountIn, onlyDex, otherExchanges = false) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const params = new URLSearchParams({
@@ -65,19 +66,31 @@ var Paraswap;
                 side: "SELL",
                 includeDEXS: onlyDex || "",
                 partner: ((_b = (_a = onlyDex === null || onlyDex === void 0 ? void 0 : onlyDex.toLowerCase()) === null || _a === void 0 ? void 0 : _a.split(",")) === null || _b === void 0 ? void 0 : _b[0]) || "",
-                // otherExchangePrices: "true",
+                otherExchangePrices: otherExchanges.toString(),
             });
             const response = yield fetch(`${URL}/prices/?${params}`);
             if (response.status < 200 || response.status >= 400)
                 throw new Error(`${response.statusText}`);
-            return (yield response.json()).priceRoute; //TODO pangolin onlyDex not working?
+            return (yield response.json()).priceRoute;
         });
     }
     Paraswap.findRoute = findRoute;
-    function directPath(route, onlyDex) {
-        return route.bestRoute[0].swaps[0].swapExchanges[0].data.path; // TODO find?
+    function getDirectPath(route, onlyDex) {
+        const bestRoute = lodash_1.default.sortBy(route.bestRoute, (r) => r.percent).reverse()[0];
+        if (bestRoute.swaps.length > 1)
+            throw new Error(`invalid direct path more than 1 path`);
+        if (!(0, web3_candies_1.eqIgnoreCase)(bestRoute.swaps[0].srcToken, route.srcToken) ||
+            !(0, web3_candies_1.eqIgnoreCase)(bestRoute.swaps[0].destToken, route.destToken))
+            throw new Error(`invalid direct path tokens`);
+        const bestSwap = lodash_1.default.sortBy(bestRoute.swaps[0].swapExchanges, (s) => s.percent).reverse()[0];
+        if (!onlyDex.split(",").includes(bestSwap.exchange))
+            throw new Error(`invalid direct path exchange`);
+        const path = bestSwap.data.path;
+        if (!path || path.length < 2)
+            throw new Error(`invalid direct path`);
+        return path;
     }
-    Paraswap.directPath = directPath;
+    Paraswap.getDirectPath = getDirectPath;
     function buildSwapData(paraswapRoute, exchangeAdapter) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield fetch(`${URL}/transactions/${paraswapRoute.network}?ignoreChecks=true`, {

package/dist/typechain-hardhat/contracts/exchange/UniswapV2Exchange.d.ts

@@ -13,7 +13,7 @@ export interface UniswapV2Exchange extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): UniswapV2Exchange;
     clone(): UniswapV2Exchange;
     methods: {
-        getAmountOut(arg0: string, arg1: string, amountIn: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
+        getAmountOut(srcToken: string, dstToken: string, amountIn: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<string>;
         swap(_srcToken: string, arg1: string, amountIn: number | string | BigNumber, amountOutMin: number | string | BigNumber, data: string | number[]): NonPayableTransactionObject<void>;
         uniswap(): NonPayableTransactionObject<string>;
     };

package/package.json

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