From 4db6e8d2238cb0cb6ced04a3d57b58ba5cb81900 Mon Sep 17 00:00:00 2001 From: pseudoelement Date: Thu, 5 Dec 2024 16:17:36 +0300 Subject: [PATCH 1/3] 802-150, fix Meson --- package.json | 2 +- .../meson-provider/meson-cross-chain-provider.ts | 7 +++++-- .../meson-provider/models/meson-api-types.ts | 8 +++++--- .../services/meson-cross-chain-api-service.ts | 15 ++++++--------- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 20310caca2f..652ac9763b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.47.3", + "version": "5.47.4-alpha.meson.2", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts index f969b5f83e9..c153a59c068 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts +++ b/src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts @@ -153,12 +153,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/src/features/cross-chain/calculation-manager/providers/meson-provider/models/meson-api-types.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/models/meson-api-types.ts index 6fd88715ed2..7daaa6483d8 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/models/meson-api-types.ts +++ b/src/features/cross-chain/calculation-manager/providers/meson-provider/models/meson-api-types.ts @@ -2,9 +2,7 @@ export type MesonErrorRes = { 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/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts index 683810de00e..47a1e4e9b0f 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts +++ b/src/features/cross-chain/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(e); + const res = this.parseMesonError(e); - return res.totalFee; + return res.fee; } } @@ -127,16 +128,12 @@ export class MesonCcrApiService { const { error: { - error: { - data: { swapData } - } + error: { data } } } = err as MesonErrorRes; - if ('converted' in swapData) { - throw new NotSupportedTokensError(); - } + if (!data) throw new NotSupportedTokensError(); - return swapData; + return data; } } From 9c223fdfe09d771a168054f4f71dd1f5973bbe32 Mon Sep 17 00:00:00 2001 From: pseudoelement Date: Fri, 6 Dec 2024 12:04:29 +0300 Subject: [PATCH 2/3] 802-150, micro fix --- package.json | 2 +- .../meson-provider/services/meson-cross-chain-api-service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 652ac9763b4..0d1da410acd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.47.4-alpha.meson.2", + "version": "5.47.4-alpha.meson.3", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts b/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts index 47a1e4e9b0f..1554f40eff0 100644 --- a/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts +++ b/src/features/cross-chain/calculation-manager/providers/meson-provider/services/meson-cross-chain-api-service.ts @@ -132,7 +132,7 @@ export class MesonCcrApiService { } } = err as MesonErrorRes; - if (!data) throw new NotSupportedTokensError(); + if (!data || 'converted' in data) throw new NotSupportedTokensError(); return data; } From f5774309098ef9fdbfc0b4da9b0ac13f75c9d8d8 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 28 Dec 2024 18:31:30 +0300 Subject: [PATCH 3/3] set sdk release version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d1da410acd..a6bdb7322a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubic-sdk", - "version": "5.47.4-alpha.meson.3", + "version": "5.49.10", "description": "Simplify dApp creation", "main": "lib/index.js", "types": "lib/index.d.ts",