@orbs-network/twap 1.8.1 → 1.8.3

package/dist/src/lib.d.ts

@@ -2,6 +2,8 @@ import { Config, TokenData } from "./configs";
 import BN from "bignumber.js";
 import type { TWAP } from "../typechain-hardhat/contracts";
 import type { Lens } from "../typechain-hardhat/contracts/periphery";
+import { Paraswap } from "./paraswap";
+import ParaswapRoute = Paraswap.ParaswapRoute;
 export declare const twapAbi: any;
 export declare const lensAbi: any;
 export declare const takerAbi: any;
@@ -39,12 +41,19 @@ export declare class TWAPLib {
     getAllOrders(): Promise<Order[]>;
     parseOrder(r: any): Order;
     getToken(address: string): Promise<TokenData>;
-    findSwapDataForBid(orderId: number): Promise<{
+    findSwapDataForBid(order: Order): Promise<{
         srcToken: TokenData;
         dstToken: TokenData;
-        srcAmountIn: BN;
-        dstAmountOut: BN;
-        raw: any;
+        srcNextChunkAmountIn: BN;
+        dstNextChunkAmountOut: BN;
+        raw: string[] | Paraswap.ParaswapRoute;
+        data: string;
+    }>;
+    convertRouteToSwapData(route: ParaswapRoute): Promise<{
+        raw: string[];
+        data: string;
+    } | {
+        raw: Paraswap.ParaswapRoute;
         data: string;
     }>;
 }

package/dist/src/lib.js

@@ -209,33 +209,32 @@ class TWAPLib {
             return { address, decimals: yield t.decimals(), symbol: yield t.methods.symbol().call() };
         });
     }
-    findSwapDataForBid(orderId) {
+    findSwapDataForBid(order) {
         return __awaiter(this, void 0, void 0, function* () {
-            const order = yield this.getOrder(orderId);
-            const srcAmountIn = bignumber_js_1.default.min(order.ask.srcBidAmount, order.ask.srcAmount.minus(order.srcFilledAmount));
+            if (order.ask.exchange !== web3_candies_1.zeroAddress && !(0, web3_candies_1.eqIgnoreCase)(order.ask.exchange, this.config.exchangeAddress))
+                throw new Error(`mismatched exchange and config`);
+            const srcNextChunkAmountIn = 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);
+            const route = yield paraswap_1.Paraswap.findRoute(this.config.chainId, srcToken, dstToken, srcNextChunkAmountIn, this.config.pathfinderKey);
+            const dstNextChunkAmountOut = (0, bignumber_js_1.default)(route.destAmount);
+            const { raw, data } = yield this.convertRouteToSwapData(route);
+            return { srcToken, dstToken, srcNextChunkAmountIn, dstNextChunkAmountOut, raw, data };
+        });
+    }
+    convertRouteToSwapData(route) {
+        return __awaiter(this, void 0, void 0, function* () {
             switch (this.config.exchangeType) {
                 case "UniswapV2Exchange":
                     const path = paraswap_1.Paraswap.getDirectPath(route, this.config.pathfinderKey);
                     return {
-                        srcToken,
-                        dstToken,
-                        srcAmountIn,
-                        dstAmountOut,
                         raw: path,
                         data: (0, web3_candies_1.web3)().eth.abi.encodeParameters(["bool", "address[]"], [true, path]),
                     };
                 case "ParaswapExchange":
                     return {
-                        srcToken,
-                        dstToken,
-                        srcAmountIn,
-                        dstAmountOut,
                         raw: route,
                         data: yield paraswap_1.Paraswap.buildSwapData(route, this.config.twapAddress),
                     };

package/package.json

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