From 31efda9969721403558d6a1a4b9497568ecddb8a Mon Sep 17 00:00:00 2001
From: lomonoshka <scrinium1998@yandex.ru>
Date: Mon, 30 Oct 2023 20:07:06 +0400
Subject: [PATCH] Return exchange precision in swapDescription

---
 package.json                              |  2 +-
 src/Unit/Exchange/generateSwapCalldata.ts | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 18ea5e3..ea50977 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.10-rc102",
+  "version": "0.20.10-rc103",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts
index cef0f02..2a90444 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -91,18 +91,17 @@ export async function generateSwapCalldata({
   const { factory, assetIn: srcToken } = path.first();
   const dstToken = path.last().assetOut;
 
-  const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, provider);
-  const minReturnAmountNativeDecimals = await exchangeToNativeDecimals(dstToken, minReturnAmount, provider);
   let swapDescription: LibValidator.SwapDescriptionStruct = {
     srcToken: srcToken,
     dstToken: dstToken,
     srcReceiver: swapExecutorContractAddress,
     dstReceiver: receiverAddress,
-    amount: amountNativeDecimals,
-    minReturnAmount: minReturnAmountNativeDecimals,
+    amount,
+    minReturnAmount,
     flags: 0,
   };
-
+  const amountNativeDecimals = await exchangeToNativeDecimals(srcToken, amount, provider);
+  
   path = SafeArray.from(arrayLikePath).map((singleSwap) => {
     if (singleSwap.assetIn == ethers.ZeroAddress) singleSwap.assetIn = wethAddress;
     if (singleSwap.assetOut == ethers.ZeroAddress) singleSwap.assetOut = wethAddress;
@@ -132,7 +131,7 @@ export async function generateSwapCalldata({
     ));
   }
 
-  calls = wrapOrUnwrapIfNeeded(swapDescription, calls);
+  calls = wrapOrUnwrapIfNeeded(amountNativeDecimals, swapDescription, calls);
   const calldata = generateCalls(calls);
   return { swapDescription, calldata };
 }
@@ -248,7 +247,7 @@ async function processMultiFactorySwaps(
   return { swapDescription, calls };
 }
 
-function wrapOrUnwrapIfNeeded(swapDescription: LibValidator.SwapDescriptionStruct, calls: BytesLike[]): BytesLike[] {
+function wrapOrUnwrapIfNeeded(amount: BigNumberish, swapDescription: LibValidator.SwapDescriptionStruct, calls: BytesLike[]): BytesLike[] {
   if (swapDescription.srcToken === ZeroAddress) {
     const wrapCall = generateWrapAndTransferCall(swapDescription.dstReceiver, { value: swapDescription.amount });
     calls = ([wrapCall] as BytesLike[]).concat(calls);