802-150, fix Meson (#772)

Cryptorubic · Dec 28, 2024 · 638e206 · 638e206
2 parents b18d273 + 9ad79a1
commit 638e206
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rubic-sdk",
-    "version": "5.49.9",
+    "version": "5.49.10",
     "description": "Simplify dApp creation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

diff --git a/...es/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts b/...es/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts
@@ -141,12 +141,15 @@ export class MesonCrossChainProvider extends CrossChainProvider {
             sourceToken.tokenAmount.toFixed()
         );
 
+        const min = Math.max(Number(sourceTokenInfo.min), Number(targetTokenInfo.min));
+        const max = Math.min(Number(sourceTokenInfo.max), Number(targetTokenInfo.max));
+
         return {
             mesonFee,
             sourceAssetString,
             targetAssetString,
-            min: new BigNumber(sourceTokenInfo.min),
-            max: new BigNumber(sourceTokenInfo.max)
+            min: new BigNumber(min),
+            max: new BigNumber(max)
         };
     }
 

diff --git a/...atures/cross-chain/calculation-manager/providers/meson-provider/models/meson-api-types.ts b/...atures/cross-chain/calculation-manager/providers/meson-provider/models/meson-api-types.ts
@@ -2,9 +2,7 @@ export type MesonErrorRes<T> = {
     error: {
         error: {
             code: number;
-            data: {
-                swapData: T;
-            };
+            data: T;
             message: string;
         };
     };
@@ -89,6 +87,10 @@ export interface TxFeeSchema {
     converted?: { amount: string; token: string };
 }
 
+export interface ErrorFeeResp {
+    fee: string;
+}
+
 export interface TxStatusSchema {
     expired?: boolean;
     LOCKED: string;

diff --git a/...in/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts b/...in/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts
@@ -5,6 +5,7 @@ import { TxStatusData } from 'src/features/common/status-manager/models/tx-statu
 
 import {
     EncodeSwapSchema,
+    ErrorFeeResp,
     FetchEncodedParamRequest,
     MesonErrorRes,
     MesonLimitsChain,
@@ -38,9 +39,9 @@ export class MesonCcrApiService {
 
             return res.result.totalFee;
         } catch (e: unknown) {
-            const res = this.parseMesonError<TxFeeSchema>(e);
+            const res = this.parseMesonError<ErrorFeeResp>(e);
 
-            return res.totalFee;
+            return res.fee;
         }
     }
 
@@ -127,16 +128,12 @@ export class MesonCcrApiService {
 
         const {
             error: {
-                error: {
-                    data: { swapData }
-                }
+                error: { data }
             }
         } = err as MesonErrorRes<T>;
 
-        if ('converted' in swapData) {
-            throw new NotSupportedTokensError();
-        }
+        if (!data || 'converted' in data) throw new NotSupportedTokensError();
 
-        return swapData;
+        return data;
     }
 }