Merge pull request #259 from gmbronco/develop

improvement: return tokens passed by a user on top of used in relayers
balancer · May 18, 2022 · cc4ef94 · cc4ef94
2 parents 0dd1dbc + 0684865
commit cc4ef94
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -7,7 +7,9 @@ export const EMPTY_SWAPINFO: SwapInfo = {
     swapAmount: Zero,
     swapAmountForSwaps: Zero,
     tokenIn: '',
+    tokenInForSwaps: '',
     tokenOut: '',
+    tokenOutFromSwaps: '',
     returnAmount: Zero,
     returnAmountConsideringFees: Zero,
     returnAmountFromSwaps: Zero,

diff --git a/src/formatSwaps.ts b/src/formatSwaps.ts
@@ -120,7 +120,9 @@ export function formatSwaps(
 
     const swapInfo: SwapInfo = {
         swapAmount,
+        swapAmountForSwaps: swapAmount,
         returnAmount,
+        returnAmountFromSwaps: returnAmount,
         returnAmountConsideringFees,
         swaps,
         tokenAddresses,

diff --git a/src/types.ts b/src/types.ts
@@ -121,12 +121,14 @@ export interface SwapInfo {
     tokenAddresses: string[];
     swaps: SwapV2[];
     swapAmount: BigNumber;
-    swapAmountForSwaps?: BigNumber; // Used with stETH/wstETH
+    swapAmountForSwaps: BigNumber; // Used with stETH/wstETH
     returnAmount: BigNumber;
-    returnAmountFromSwaps?: BigNumber; // Used with stETH/wstETH
+    returnAmountFromSwaps: BigNumber; // Used with stETH/wstETH
     returnAmountConsideringFees: BigNumber;
     tokenIn: string;
+    tokenInForSwaps?: string; // Used with stETH/wstETH
     tokenOut: string;
+    tokenOutFromSwaps?: string; // Used with stETH/wstETH
     marketSp: string;
 }
 

diff --git a/src/wrapInfo.ts b/src/wrapInfo.ts
@@ -147,6 +147,9 @@ export function setWrappedInfo(
     swapInfo.swapAmountForSwaps = swapInfo.swapAmount;
     swapInfo.returnAmountFromSwaps = swapInfo.returnAmount;
 
+    swapInfo.tokenInForSwaps = wrappedInfo.tokenIn.addressForSwaps;
+    swapInfo.tokenOutFromSwaps = wrappedInfo.tokenOut.addressForSwaps;
+
     // No wrapping required
     if (
         wrappedInfo.tokenIn.wrapType === WrapTypes.None &&