[VEN-2386]: Remove round-up in the conversion rates of Token Converters

contracts/Test/imports.sol

@@ -9,3 +9,4 @@ pragma solidity 0.8.13;
 
 import { UpgradeableBeacon } from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
 import { BeaconProxy } from "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
+import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";

contracts/TokenConverter/AbstractTokenConverter.sol

@@ -545,6 +545,7 @@ abstract contract AbstractTokenConverter is AccessControlledV8, IAbstractTokenCo
 
     /// @notice To get the amount of tokenAddressOut tokens sender could receive on providing amountInMantissa tokens of tokenAddressIn.
     /// This function does not account for potential token transfer fees(in case of deflationary tokens)
+    /// @notice The amountInMantissa might be adjusted if amountOutMantissa is greater than the balance of the contract for tokenAddressOut
     /// @dev This function retrieves values without altering token prices
     /// @param amountInMantissa Amount of tokenAddressIn
     /// @param tokenAddressIn Address of the token to convert
@@ -574,9 +575,7 @@ abstract contract AbstractTokenConverter is AccessControlledV8, IAbstractTokenCo
 
         /// If contract has less liquidity for tokenAddressOut than amountOutMantissa
         if (maxTokenOutReserve < amountOutMantissa) {
-            amountConvertedMantissa =
-                ((maxTokenOutReserve * EXP_SCALE) + tokenInToOutConversion - 1) /
-                tokenInToOutConversion; //round-up
+            amountConvertedMantissa = _divRoundingUp(maxTokenOutReserve * EXP_SCALE, tokenInToOutConversion);
             amountOutMantissa = maxTokenOutReserve;
         }
     }
@@ -808,6 +807,7 @@ abstract contract AbstractTokenConverter is AccessControlledV8, IAbstractTokenCo
 
     /// @dev Converts tokens for tokenAddressIn for the amount of tokenAddressOut used for deflationary tokens
     /// it is called by convertForExactTokensSupportingFeeOnTransferTokens function
+    /// @notice Advising users to input a smaller amountOutMantissa to avoid potential transaction revert
     /// @param amountInMaxMantissa Max amount of tokenAddressIn
     /// @param amountOutMantissa Amount of tokenAddressOut required as output
     /// @param tokenAddressIn Address of the token to convert
@@ -1089,17 +1089,16 @@ abstract contract AbstractTokenConverter is AccessControlledV8, IAbstractTokenCo
         /// conversion rate after considering incentive(conversionWithIncentive)
         uint256 conversionWithIncentive = MANTISSA_ONE + incentive;
 
+        tokenInToOutConversion = (tokenInUnderlyingPrice * conversionWithIncentive) / tokenOutUnderlyingPrice;
         /// amount of tokenAddressOut after including incentive as amountOutMantissa will be greater than actual as it gets
         /// multiplied by conversionWithIncentive which will be >= 1
-        amountOutMantissa =
-            (amountInMantissa * tokenInUnderlyingPrice * conversionWithIncentive) /
-            (tokenOutUnderlyingPrice * EXP_SCALE);
-
-        tokenInToOutConversion = (tokenInUnderlyingPrice * conversionWithIncentive) / tokenOutUnderlyingPrice;
+        amountOutMantissa = (amountInMantissa * tokenInToOutConversion) / (EXP_SCALE);
     }
 
     /// @dev To get the amount of tokenAddressIn tokens sender would send on receiving amountOutMantissa tokens of tokenAddressOut
     /// @dev This function retrieves values without altering token prices.
+    /// @dev For user conversions, the function returns an amountInMantissa that is rounded up, ensuring that the equivalent amountInMantissa
+    /// is obtained from users for corresponding amountOutMantissa, preventing any losses to the protocol. However, no rounding up is required for private conversions
     /// @param amountOutMantissa Amount of tokenAddressOut user wants to receive
     /// @param tokenAddressIn Address of the token to convert
     /// @param tokenAddressOut Address of the token to get after conversion
@@ -1126,16 +1125,29 @@ abstract contract AbstractTokenConverter is AccessControlledV8, IAbstractTokenCo
         uint256 tokenOutUnderlyingPrice = priceOracle.getPrice(tokenAddressOut);
 
         uint256 incentive = configuration.incentive;
-        if ((address(converterNetwork) != address(0)) && (converterNetwork.isTokenConverter(msg.sender))) {
+
+        bool isPrivateConversion = address(converterNetwork) != address(0) &&
+            converterNetwork.isTokenConverter(msg.sender);
+        if (isPrivateConversion) {
             incentive = 0;
         }
 
         /// conversion rate after considering incentive(conversionWithIncentive)
         uint256 conversionWithIncentive = MANTISSA_ONE + incentive;
-        tokenInToOutConversion = (tokenInUnderlyingPrice * conversionWithIncentive) / tokenOutUnderlyingPrice;
 
         /// amount of tokenAddressIn after considering incentive(i.e. amountInMantissa will be less than actual amountInMantissa if incentive > 0)
-        amountInMantissa = ((amountOutMantissa * EXP_SCALE) + tokenInToOutConversion - 1) / tokenInToOutConversion; //round-up
+        if (isPrivateConversion) {
+            amountInMantissa =
+                (amountOutMantissa * tokenOutUnderlyingPrice * EXP_SCALE) /
+                (tokenInUnderlyingPrice * conversionWithIncentive);
+        } else {
+            amountInMantissa = _divRoundingUp(
+                amountOutMantissa * tokenOutUnderlyingPrice * EXP_SCALE,
+                tokenInUnderlyingPrice * conversionWithIncentive
+            );
+        }
+
+        tokenInToOutConversion = (tokenInUnderlyingPrice * conversionWithIncentive) / tokenOutUnderlyingPrice;
     }
 
     /// @dev Check if msg.sender is allowed to convert as per onlyForPrivateConversions flag
@@ -1164,4 +1176,12 @@ abstract contract AbstractTokenConverter is AccessControlledV8, IAbstractTokenCo
     /// @dev Get base asset address of the destination contract
     /// @return Address of the base asset
     function _getDestinationBaseAsset() internal view virtual returns (address) {}
+
+    /// @dev Performs division where the result is rounded up
+    /// @param numerator The numerator of the division operation
+    /// @param denominator The denominator of the division operation. Must be non-zero
+    /// @return The result of the division, rounded up
+    function _divRoundingUp(uint256 numerator, uint256 denominator) internal pure returns (uint256) {
+        return (numerator + denominator - 1) / denominator;
+    }
 }

deployments/bscmainnet.json

@@ -5127,7 +5127,7 @@
       ]
     },
     "RiskFundConverter_Implementation": {
-      "address": "0x2fB02b3D49D45967DA471C7685Ce524d833520Dc",
+      "address": "0xd420Bf9C31F6b4a98875B6e561b13aCB19210647",
       "abi": [
         {
           "inputs": [
@@ -7632,7 +7632,7 @@
       ]
     },
     "SingleTokenConverterImp": {
-      "address": "0xe80f5A2adE24bEd740408B944197b3c24f2f2e91",
+      "address": "0x40ed28180Df01FdeB957224E4A5415704B9D5990",
       "abi": [
         {
           "inputs": [],

deployments/bscmainnet_addresses.json

@@ -12,11 +12,11 @@
     "ProtocolShareReserve_Implementation": "0x86a2a5EB77984E923E7B5Af45819A8c8f870f061",
     "ProtocolShareReserve_Proxy": "0xCa01D5A9A248a830E9D93231e791B1afFed7c446",
     "RiskFundConverter": "0xA5622D276CcbB8d9BBE3D1ffd1BB11a0032E53F0",
-    "RiskFundConverter_Implementation": "0x2fB02b3D49D45967DA471C7685Ce524d833520Dc",
+    "RiskFundConverter_Implementation": "0xd420Bf9C31F6b4a98875B6e561b13aCB19210647",
     "RiskFundConverter_Proxy": "0xA5622D276CcbB8d9BBE3D1ffd1BB11a0032E53F0",
     "RiskFundV2": "0x2F377545Fd095fA59A56Cb1fD7456A2a0B781Cb6",
     "SingleTokenConverterBeacon": "0x4c9D57b05B245c40235D720A5f3A592f3DfF11ca",
-    "SingleTokenConverterImp": "0xe80f5A2adE24bEd740408B944197b3c24f2f2e91",
+    "SingleTokenConverterImp": "0x40ed28180Df01FdeB957224E4A5415704B9D5990",
     "USDCPrimeConverter": "0xa758c9C215B6c4198F0a0e3FA46395Fa15Db691b",
     "USDTPrimeConverter": "0xD9f101AA67F3D72662609a2703387242452078C3",
     "XVSVaultConverter": "0xd5b9AE835F4C59272032B3B954417179573331E0",

deployments/bsctestnet.json

@@ -5127,7 +5127,7 @@
       ]
     },
     "RiskFundConverter_Implementation": {
-      "address": "0xbF732B12f87963dF5d7c729E84E5CF3698F8d349",
+      "address": "0x857ebb8CAcb97DE5ab719320c9FB3aa16076bFe3",
       "abi": [
         {
           "inputs": [
@@ -7584,7 +7584,7 @@
       ]
     },
     "SingleTokenConverterImp": {
-      "address": "0xf014C86b6071cfFB8fE39306F802770C70733a23",
+      "address": "0x42Ec3Eb6F23460dFDfa3aE5688f3415CDfE0C6AD",
       "abi": [
         {
           "inputs": [],