@orbs-network/twap 1.8.0 → 1.8.2

package/dist/src/configs.d.ts

@@ -7,6 +7,7 @@ export interface TokenData {
 }
 export interface Config {
     chainId: number;
+    chainName: string;
     twapAddress: string;
     lensAddress: string;
     bidDelaySeconds: number;
@@ -19,6 +20,7 @@ export interface Config {
 }
 export declare const ChainConfigs: {
     eth: {
+        chainName: string;
         chainId: number;
         twapAddress: string;
         lensAddress: string;
@@ -32,6 +34,7 @@ export declare const ChainConfigs: {
         };
     };
     ftm: {
+        chainName: string;
         chainId: number;
         twapAddress: string;
         lensAddress: string;
@@ -45,6 +48,7 @@ export declare const ChainConfigs: {
         };
     };
     poly: {
+        chainName: string;
         chainId: number;
         twapAddress: string;
         lensAddress: string;
@@ -58,6 +62,7 @@ export declare const ChainConfigs: {
         };
     };
     avax: {
+        chainName: string;
         chainId: number;
         twapAddress: string;
         lensAddress: string;
@@ -80,6 +85,7 @@ export declare const Configs: {
 export declare const nativeTokenAddresses: string[];
 export declare const isNativeAddress: (address: string) => boolean;
 export declare const chainConfig: (chainId: number) => {
+    chainName: string;
     chainId: number;
     twapAddress: string;
     lensAddress: string;
@@ -92,6 +98,7 @@ export declare const chainConfig: (chainId: number) => {
         logoUrl: string;
     };
 } | {
+    chainName: string;
     chainId: number;
     twapAddress: string;
     lensAddress: string;
@@ -104,6 +111,7 @@ export declare const chainConfig: (chainId: number) => {
         logoUrl: string;
     };
 } | {
+    chainName: string;
     chainId: number;
     twapAddress: string;
     lensAddress: string;
@@ -116,6 +124,7 @@ export declare const chainConfig: (chainId: number) => {
         logoUrl: string;
     };
 } | {
+    chainName: string;
     chainId: number;
     twapAddress: string;
     lensAddress: string;

package/dist/src/configs.js

@@ -9,6 +9,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const paraswap_1 = require("./paraswap");
 exports.ChainConfigs = {
     eth: {
+        chainName: "eth",
         chainId: 1,
         twapAddress: "",
         lensAddress: "",
@@ -22,6 +23,7 @@ exports.ChainConfigs = {
         },
     },
     ftm: {
+        chainName: "ftm",
         chainId: 250,
         twapAddress: "0xBb9F828E34A1327607c3e4eA3dD35891398DD5EE",
         lensAddress: "0x042799657E971855eD619046aeDf7F30DB56d2D6",
@@ -35,6 +37,7 @@ exports.ChainConfigs = {
         },
     },
     poly: {
+        chainName: "poly",
         chainId: 137,
         twapAddress: "0xBAFdE1cc254BB94Be5866d5a86ddafde4BB44EEF",
         lensAddress: "0xc918bdC47264687796Cd54FE362FaC4f8b99Eb55",
@@ -48,6 +51,7 @@ exports.ChainConfigs = {
         },
     },
     avax: {
+        chainName: "avax",
         chainId: 43114,
         twapAddress: "0xD63430c74C8E70D9dbdCA04C6a9E6E9E929028DA",
         lensAddress: "0xD13609A8ace04D11Ea2FFE176B69dF77C6d9375E",

package/dist/src/lib.d.ts

@@ -39,11 +39,11 @@ 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;
+        srcNextChunkAmountIn: BN;
+        dstNextChunkAmountOut: BN;
         raw: any;
         data: string;
     }>;

package/dist/src/lib.js

@@ -209,24 +209,25 @@ 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);
             switch (this.config.exchangeType) {
                 case "UniswapV2Exchange":
                     const path = paraswap_1.Paraswap.getDirectPath(route, this.config.pathfinderKey);
                     return {
                         srcToken,
                         dstToken,
-                        srcAmountIn,
-                        dstAmountOut,
+                        srcNextChunkAmountIn,
+                        dstNextChunkAmountOut,
                         raw: path,
                         data: (0, web3_candies_1.web3)().eth.abi.encodeParameters(["bool", "address[]"], [true, path]),
                     };
@@ -234,8 +235,8 @@ class TWAPLib {
                     return {
                         srcToken,
                         dstToken,
-                        srcAmountIn,
-                        dstAmountOut,
+                        srcNextChunkAmountIn,
+                        dstNextChunkAmountOut,
                         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.0",
+  "version": "1.8.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/orbs-network/twap.git"
@@ -23,7 +23,7 @@
     "prettier": "prettier --write '{test,src,contracts}/**/*.{ts,js,json,sol}'",
     "typechain": "npm run clean && hardhat typechain",
     "prebuild": "npm run prettier && npm run typechain",
-    "build": "hardhat compile && solhint 'contracts/**/*.sol' && tsc",
+    "build": "hardhat compile && solhint 'contracts/**/*.sol' && tsc && hardhat github-pages",
     "prepublishOnly": "npm run build",
     "test:logs": "for t in eth ftm poly avax; do DEBUG=web3-candies npm run test:$t -- --logs; done",
     "test": "for t in eth ftm poly avax; do npm run test:$t; done",