@orbs-network/twap 1.9.3 → 1.9.5

package/dist/src/configs.js

@@ -41,9 +41,9 @@ exports.ChainConfigs = {
     poly: {
         chainName: "poly",
         chainId: 137,
-        twapVersion: 3,
-        twapAddress: "0xBAFdE1cc254BB94Be5866d5a86ddafde4BB44EEF",
-        lensAddress: "0xc918bdC47264687796Cd54FE362FaC4f8b99Eb55",
+        twapVersion: 4,
+        twapAddress: "0xceFf098C9199c5d9cf24078dc14Eb8F787631cC0",
+        lensAddress: "0x8ffde23Fba2d7Aea9C3CBf2d5B7B533BB46754a8",
         bidDelaySeconds: 60,
         minChunkSizeUsd: 10,
         wToken: {

package/dist/src/lib.d.ts

@@ -39,7 +39,7 @@ export declare class TWAPLib {
     hasAllowance(srcToken: TokenData, amount: BN.Value): Promise<boolean>;
     approve(srcToken: TokenData, amount: BN.Value, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
     validateTokens(srcToken: TokenData, dstToken: TokenData): TokensValidation;
-    validateOrderInputs(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: BN.Value, fillDelaySeconds: BN.Value, srcUsd: BN.Value, askDataParams: any[]): OrderInputValidation;
+    validateOrderInputs(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: BN.Value, fillDelaySeconds: BN.Value, srcUsd: BN.Value): OrderInputValidation;
     submitOrder(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: number, fillDelaySeconds: number, srcUsd: BN.Value, askDataParams?: any[], maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<number>;
     getOrder(id: number): Promise<Order>;
     cancelOrder(id: number, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<void>;
@@ -104,8 +104,7 @@ export declare enum OrderInputValidation {
     invalidDeadline = "invalidDeadline",
     invalidFillDelaySeconds = "invalidFillDelaySeconds",
     invalidSrcUsd = "invalidSrcUsd",
-    invalidSmallestSrcChunkUsd = "invalidSmallestSrcChunkUsd",
-    invalidAskDataParams = "invalidAskDataParams"
+    invalidSmallestSrcChunkUsd = "invalidSmallestSrcChunkUsd"
 }
 export declare enum TokensValidation {
     valid = "valid",

package/dist/src/lib.js

@@ -117,7 +117,7 @@ class TWAPLib {
             return TokensValidation.dstTokenZero;
         return TokensValidation.valid;
     }
-    validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, askDataParams) {
+    validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd) {
         const tokensValidation = this.validateTokens(srcToken, dstToken);
         if (tokensValidation === TokensValidation.invalid)
             return OrderInputValidation.invalidTokens;
@@ -137,13 +137,11 @@ class TWAPLib {
             .times(srcUsd)
             .lt((0, bignumber_js_1.default)(this.config.minChunkSizeUsd).times((0, bignumber_js_1.default)(10).pow(srcToken.decimals))))
             return OrderInputValidation.invalidSmallestSrcChunkUsd;
-        if (this.config.exchangeType === "PangolinDaasExchange" && !lodash_1.default.get(askDataParams, [0]))
-            return OrderInputValidation.invalidAskDataParams;
         return OrderInputValidation.valid;
     }
     submitOrder(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, askDataParams = [], maxPriorityFeePerGas, maxFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            let validation = this.validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, askDataParams);
+            let validation = this.validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd);
             if (validation !== OrderInputValidation.valid)
                 throw new Error(`invalid inputs: ${validation}`);
             const askData = this.config.exchangeType === "PangolinDaasExchange"
@@ -193,10 +191,10 @@ class TWAPLib {
         return {
             id: Number(r.id),
             status: Number(r.status),
-            time: Number(r.time),
+            time: Number(r.time || r.ask.time),
             filledTime: Number(r.filledTime),
             srcFilledAmount: (0, bignumber_js_1.default)(r.srcFilledAmount),
-            maker: web3_1.default.utils.toChecksumAddress(r.maker),
+            maker: web3_1.default.utils.toChecksumAddress(r.maker || r.ask.maker),
             ask: {
                 deadline: Number(r.ask.deadline),
                 bidDelay: Number(r.ask.bidDelay),
@@ -284,7 +282,6 @@ var OrderInputValidation;
     OrderInputValidation["invalidFillDelaySeconds"] = "invalidFillDelaySeconds";
     OrderInputValidation["invalidSrcUsd"] = "invalidSrcUsd";
     OrderInputValidation["invalidSmallestSrcChunkUsd"] = "invalidSmallestSrcChunkUsd";
-    OrderInputValidation["invalidAskDataParams"] = "invalidAskDataParams";
 })(OrderInputValidation = exports.OrderInputValidation || (exports.OrderInputValidation = {}));
 var TokensValidation;
 (function (TokensValidation) {

package/package.json

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