@orbs-network/twap 1.9.0 → 1.9.3

package/dist/src/configs.d.ts

@@ -86,6 +86,7 @@ export declare const Configs: {
     SpookySwap: Config;
     Pangolin: Config;
     PangolinDaas: Config;
+    QuickSwap: Config;
 };
 export declare const nativeTokenAddresses: string[];
 export declare const isNativeAddress: (address: string) => boolean;

package/dist/src/configs.js

@@ -74,13 +74,7 @@ exports.Configs = {
     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: "0xf2d96E7BE676153d202e1453804E2749923C7c5b", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
     PangolinDaas: Object.assign(Object.assign({}, exports.ChainConfigs.avax), { partner: "PangolinDaas", exchangeAddress: "0x1579EED0527781B1A748043AA1f59a3858Ace4a7", exchangeType: "PangolinDaasExchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.Pangolin }),
-    // QuickSwap: {
-    //   ...ChainConfigs.poly,
-    //   partner: "QuickSwap",
-    //   exchangeAddress: "",
-    //   exchangeType: "UniswapV2Exchange",
-    //   pathfinderKey: Paraswap.OnlyDex.QuickSwap,
-    // } as Config,
+    QuickSwap: Object.assign(Object.assign({}, exports.ChainConfigs.poly), { partner: "QuickSwap", exchangeAddress: "0xcbD5BE6a939EAEb226824298F1FAe6B1049b71C6", exchangeType: "UniswapV2Exchange", pathfinderKey: paraswap_1.Paraswap.OnlyDex.QuickSwap }),
 };
 exports.nativeTokenAddresses = [
     web3_candies_1.zeroAddress,

package/dist/src/lib.d.ts

@@ -39,8 +39,8 @@ 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): OrderInputValidation;
-    submitOrder(srcToken: TokenData, dstToken: TokenData, srcAmount: BN.Value, srcChunkAmount: BN.Value, dstMinChunkAmountOut: BN.Value, deadline: number, fillDelaySeconds: number, srcUsd: BN.Value, askData?: string, maxPriorityFeePerGas?: BN.Value, maxFeePerGas?: BN.Value): Promise<number>;
+    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;
+    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>;
     getAllOrders(): Promise<Order[]>;
@@ -104,7 +104,8 @@ export declare enum OrderInputValidation {
     invalidDeadline = "invalidDeadline",
     invalidFillDelaySeconds = "invalidFillDelaySeconds",
     invalidSrcUsd = "invalidSrcUsd",
-    invalidSmallestSrcChunkUsd = "invalidSmallestSrcChunkUsd"
+    invalidSmallestSrcChunkUsd = "invalidSmallestSrcChunkUsd",
+    invalidAskDataParams = "invalidAskDataParams"
 }
 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) {
+    validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, askDataParams) {
         const tokensValidation = this.validateTokens(srcToken, dstToken);
         if (tokensValidation === TokensValidation.invalid)
             return OrderInputValidation.invalidTokens;
@@ -137,13 +137,18 @@ 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, askData, maxPriorityFeePerGas, maxFeePerGas) {
+    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);
+            let validation = this.validateOrderInputs(srcToken, dstToken, srcAmount, srcChunkAmount, dstMinChunkAmountOut, deadline, fillDelaySeconds, srcUsd, askDataParams);
             if (validation !== OrderInputValidation.valid)
                 throw new Error(`invalid inputs: ${validation}`);
+            const askData = this.config.exchangeType === "PangolinDaasExchange"
+                ? (0, web3_candies_1.web3)().eth.abi.encodeParameters(["address"], askDataParams)
+                : [];
             const tx = yield (0, web3_candies_1.sendAndWaitForConfirmations)(this.twap.methods.ask([
                 this.config.exchangeAddress,
                 srcToken.address,
@@ -154,7 +159,7 @@ class TWAPLib {
                 (0, bignumber_js_1.default)(deadline).div(1000).toFixed(0),
                 (0, bignumber_js_1.default)(this.config.bidDelaySeconds).toFixed(0),
                 (0, bignumber_js_1.default)(fillDelaySeconds).toFixed(0),
-                askData || [],
+                askData,
             ]), {
                 from: this.maker,
                 maxPriorityFeePerGas,
@@ -279,6 +284,7 @@ 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.0",
+  "version": "1.9.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/orbs-network/twap.git"