[Issue-3855] Update convert number and add validate receive amount

Koniverse · Dec 19, 2024 · e20df98 · e20df98
1 parent 85d98ed
commit e20df98
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/packages/extension-base/src/background/errors/SwapError.ts b/packages/extension-base/src/background/errors/SwapError.ts
@@ -49,6 +49,11 @@ const defaultErrorMap: Record<SwapErrorType, { message: string, code?: number }>
   MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT: {
     message: detectTranslate('Insufficient liquidity to complete the swap. Lower your amount and try again'),
     code: undefined
+  },
+  NOT_MEET_MIN_EXPECTED: {
+    // TODO: update message
+    message: detectTranslate('Received amount is too low. Get new quote and try again'),
+    code: undefined
   }
 };
 

diff --git a/packages/extension-base/src/services/swap-service/handler/simpleswap-handler.ts b/packages/extension-base/src/services/swap-service/handler/simpleswap-handler.ts
@@ -31,6 +31,7 @@ interface ExchangeSimpleSwapData{
   id: string;
   trace_id: string;
   address_from: string;
+  amount_to: string;
 }
 
 const apiUrl = 'https://api.simpleswap.io';
@@ -75,17 +76,20 @@ const fetchRanges = async (params: { fromSymbol: string; toSymbol: string }): Pr
 async function getEstimate (request: SwapRequest, fromAsset: _ChainAsset, toAsset: _ChainAsset): Promise<{ toAmount: string; walletFeeAmount: string }> {
   const fromSymbol = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[fromAsset.slug];
   const toSymbol = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[toAsset.slug];
+  const assetDecimals = _getAssetDecimals(fromAsset);
 
   if (!fromSymbol || !toSymbol) {
     throw new SwapError(SwapErrorType.ASSET_NOT_SUPPORTED);
   }
 
+  const formatedAmount =  formatNumber(request.fromAmount, assetDecimals, (s) => s);
+
   const params = new URLSearchParams({
     api_key: `${simpleSwapApiKey}`,
     fixed: 'false',
     currency_from: fromSymbol,
     currency_to: toSymbol,
-    amount: formatNumber(request.fromAmount, _getAssetDecimals(fromAsset))
+    amount: formatedAmount
   });
 
   try {
@@ -115,12 +119,15 @@ async function getEstimate (request: SwapRequest, fromAsset: _ChainAsset, toAsse
   }
 }
 
-const createSwapRequest = async (params: {fromSymbol: string; toSymbol: string; fromAmount: string; fromAsset: _ChainAsset; receiver: string; sender: string;}) => {
+const createSwapRequest = async (params: {fromSymbol: string; toSymbol: string; fromAmount: string; fromAsset: _ChainAsset; receiver: string; sender: string; toAsset: _ChainAsset;}) => {
+  const fromDecimals = _getAssetDecimals(params.fromAsset);
+  const toDecimals = _getAssetDecimals(params.toAsset);
+  const formatedAmount =  formatNumber(params.fromAmount, fromDecimals, (s) => s);
   const requestBody = {
     fixed: false,
     currency_from: params.fromSymbol,
     currency_to: params.toSymbol,
-    amount: formatNumber(params.fromAmount, _getAssetDecimals(params.fromAsset)), // Convert to small number due to require of api
+    amount: formatedAmount, // Convert to small number due to require of api
     address_to: params.receiver,
     extra_id_to: '',
     user_refund_address: params.sender,
@@ -145,7 +152,8 @@ const createSwapRequest = async (params: {fromSymbol: string; toSymbol: string;
 
   return {
     id: depositAddressResponse.id,
-    addressFrom: depositAddressResponse.address_from
+    addressFrom: depositAddressResponse.address_from,
+    amountTo: toBNString(depositAddressResponse.amount_to, toDecimals)
   };
 };
 
@@ -431,7 +439,19 @@ export class SimpleSwapHandler implements SwapBaseInterface {
     const toSymbol = SIMPLE_SWAP_SUPPORTED_TESTNET_ASSET_MAPPING[toAsset.slug];
 
     const { fromAmount } = quote;
-    const { addressFrom, id } = await createSwapRequest({ fromSymbol, toSymbol, fromAmount, fromAsset, receiver, sender });
+    const { addressFrom, id, amountTo } = await createSwapRequest({ fromSymbol, toSymbol, fromAmount, fromAsset, receiver, sender, toAsset });
+
+    // Validate the amount to be swapped
+    const rate = BigN(amountTo).div(BigN(quote.toAmount)).multipliedBy(100);
+
+    console.debug('quote', quote.toAmount);
+    console.debug('amountTo', amountTo);
+    console.debug('rate', rate.toFixed());
+    if (rate.lt(95)) {
+      throw new SwapError(SwapErrorType.NOT_MEET_MIN_EXPECTED);
+    }
+
+    // Can modify quote.toAmount to amountTo after confirm real amount received
 
     const txData: SimpleSwapTxData = {
       id: id,

diff --git a/packages/extension-base/src/types/swap/index.ts b/packages/extension-base/src/types/swap/index.ts
@@ -53,6 +53,7 @@ export enum SwapErrorType {
   NOT_ENOUGH_LIQUIDITY = 'NOT_ENOUGH_LIQUIDITY',
   MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = 'MAKE_POOL_NOT_ENOUGH_EXISTENTIAL_DEPOSIT',
   AMOUNT_CANNOT_BE_ZERO = 'AMOUNT_CANNOT_BE_ZERO',
+  NOT_MEET_MIN_EXPECTED = 'NOT_MEET_MIN_EXPECTED',
 }
 
 export enum SwapStepType {