@orbs-network/twap 1.6.1 → 1.6.2

package/dist/src/lib.d.ts

@@ -20,6 +20,7 @@ export declare class TWAPLib {
     totalChunks: (srcAmount: BN.Value, srcChunkAmount: BN.Value) => number;
     fillDelayMillis: (totalChunks: BN.Value, maxDurationMillis: BN.Value) => number;
     dstMinAmountOut: (srcToken: TokenData, dstToken: TokenData, srcChunkAmount: BN.Value, limitDstPriceFor1Src: BN.Value, isMarketOrder: boolean) => BN;
+    dstPriceFor1Src: (srcToken: TokenData, dstToken: TokenData, srcUsdMarket: BN.Value, dstUsdMarket: BN.Value, srcChunkAmount: BN.Value, dstMinAmountOut: BN.Value) => BN;
     isMarketOrder: (order: Order) => boolean;
     orderProgress: (order: Order) => number;
     percentAboveMarket: (srcUsdMarket: BN.Value, dstUsdMarket: BN.Value, limitDstPriceFor1Src: BN.Value) => number;
@@ -38,6 +39,11 @@ export declare class TWAPLib {
     getAllOrders(): Promise<Order[]>;
     private sendTx;
     parseOrder(r: any): Order;
+    getToken(address: string): Promise<{
+        address: string;
+        decimals: number;
+        symbol: string;
+    }>;
 }
 export interface Order {
     id: number;

package/dist/src/lib.js

@@ -40,10 +40,13 @@ class TWAPLib {
             ? 0
             : bignumber_js_1.default.max((0, bignumber_js_1.default)(maxDurationMillis)
                 .div(totalChunks)
-                .minus((0, bignumber_js_1.default)(this.config.bidDelaySeconds * 1000)), 0).toNumber();
+                .minus((0, bignumber_js_1.default)(this.config.bidDelaySeconds * 1000 * 2)), 0).toNumber();
         this.dstMinAmountOut = (srcToken, dstToken, srcChunkAmount, limitDstPriceFor1Src, isMarketOrder) => isMarketOrder
             ? (0, bignumber_js_1.default)(1)
             : bignumber_js_1.default.max(1, (0, web3_candies_1.convertDecimals)((0, bignumber_js_1.default)(srcChunkAmount).times(limitDstPriceFor1Src), srcToken.decimals, dstToken.decimals).integerValue(bignumber_js_1.default.ROUND_FLOOR));
+        this.dstPriceFor1Src = (srcToken, dstToken, srcUsdMarket, dstUsdMarket, srcChunkAmount, dstMinAmountOut) => (0, bignumber_js_1.default)(dstMinAmountOut).eq(1)
+            ? (0, bignumber_js_1.default)(srcUsdMarket).div(dstUsdMarket)
+            : (0, bignumber_js_1.default)(dstMinAmountOut).div((0, web3_candies_1.convertDecimals)((0, bignumber_js_1.default)(srcChunkAmount), srcToken.decimals, dstToken.decimals));
         this.isMarketOrder = (order) => order.ask.dstMinAmount.lte(1);
         this.orderProgress = (order) => parseFloat(order.srcFilledAmount.div(order.ask.srcAmount).toFixed(4));
         this.percentAboveMarket = (srcUsdMarket, dstUsdMarket, limitDstPriceFor1Src) => parseFloat((0, bignumber_js_1.default)(limitDstPriceFor1Src).div((0, bignumber_js_1.default)(srcUsdMarket).div(dstUsdMarket)).minus(1).toFixed(4));
@@ -191,24 +194,30 @@ class TWAPLib {
                 deadline: Number(r.ask.deadline),
                 bidDelay: Number(r.ask.bidDelay),
                 fillDelay: Number(r.ask.fillDelay),
-                maker: r.ask.maker,
-                exchange: r.ask.exchange,
-                srcToken: r.ask.srcToken,
-                dstToken: r.ask.dstToken,
+                maker: web3_1.default.utils.toChecksumAddress(r.ask.maker),
+                exchange: web3_1.default.utils.toChecksumAddress(r.ask.exchange),
+                srcToken: web3_1.default.utils.toChecksumAddress(r.ask.srcToken),
+                dstToken: web3_1.default.utils.toChecksumAddress(r.ask.dstToken),
                 srcAmount: (0, bignumber_js_1.default)(r.ask.srcAmount),
                 srcBidAmount: (0, bignumber_js_1.default)(r.ask.srcBidAmount),
                 dstMinAmount: (0, bignumber_js_1.default)(r.ask.dstMinAmount),
             },
             bid: {
                 time: Number(((_a = r.bid) === null || _a === void 0 ? void 0 : _a.time) || 0),
-                taker: ((_b = r.bid) === null || _b === void 0 ? void 0 : _b.taker) || "",
-                exchange: ((_c = r.bid) === null || _c === void 0 ? void 0 : _c.exchange) || "",
+                taker: web3_1.default.utils.toChecksumAddress(((_b = r.bid) === null || _b === void 0 ? void 0 : _b.taker) || web3_candies_1.zeroAddress),
+                exchange: web3_1.default.utils.toChecksumAddress(((_c = r.bid) === null || _c === void 0 ? void 0 : _c.exchange) || web3_candies_1.zeroAddress),
                 dstAmount: (0, bignumber_js_1.default)(((_d = r.bid) === null || _d === void 0 ? void 0 : _d.dstAmount) || web3_candies_1.zero),
                 dstFee: (0, bignumber_js_1.default)(((_e = r.bid) === null || _e === void 0 ? void 0 : _e.dstFee) || web3_candies_1.zero),
                 data: ((_f = r.bid) === null || _f === void 0 ? void 0 : _f.data) || "",
             },
         };
     }
+    getToken(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const t = (0, web3_candies_1.erc20)("", address);
+            return { address, decimals: yield t.decimals(), symbol: yield t.methods.symbol().call() };
+        });
+    }
 }
 exports.TWAPLib = TWAPLib;
 var Status;

package/package.json

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