From 721b437a7ca064de6f2e564786f401491b413901 Mon Sep 17 00:00:00 2001
From: Andrei Kozlov <kyzia.ru@gmail.com>
Date: Wed, 14 Aug 2024 08:26:37 +0300
Subject: [PATCH] add RAY constant

---
 .../static-a-token/Stata4626Upgradable.sol          | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/periphery/contracts/static-a-token/Stata4626Upgradable.sol b/src/periphery/contracts/static-a-token/Stata4626Upgradable.sol
index eaa02320..6c783679 100644
--- a/src/periphery/contracts/static-a-token/Stata4626Upgradable.sol
+++ b/src/periphery/contracts/static-a-token/Stata4626Upgradable.sol
@@ -35,6 +35,8 @@ abstract contract Stata4626Upgradable is ERC4626Upgradeable, IStata4626 {
     }
   }
 
+  uint256 public constant RAY = 1e27;
+
   IPool public immutable POOL;
   IPoolAddressesProvider public immutable POOL_ADDRESSES_PROVIDER;
 
@@ -134,12 +136,9 @@ abstract contract Stata4626Upgradable is ERC4626Upgradeable, IStata4626 {
     // if no supply cap deposit is unlimited
     if (supplyCap == 0) return type(uint256).max;
 
-    // TODO: revalidate
     // return remaining supply cap margin
-    //    uint256 currentSupply = (IAToken(reserveData.aTokenAddress).scaledTotalSupply() +
-    //      reserveData.accruedToTreasury).rayMulRoundUp(_rate());
     uint256 currentSupply = (IAToken(reserveData.aTokenAddress).scaledTotalSupply() +
-      reserveData.accruedToTreasury).mulDiv(_rate(), 1e27, Math.Rounding.Ceil);
+      reserveData.accruedToTreasury).mulDiv(_rate(), RAY, Math.Rounding.Ceil);
     return currentSupply > supplyCap ? 0 : supplyCap - currentSupply;
   }
 
@@ -147,7 +146,7 @@ abstract contract Stata4626Upgradable is ERC4626Upgradeable, IStata4626 {
   function latestAnswer() external view returns (int256) {
     uint256 aTokenUnderlyingAssetPrice = IAaveOracle(POOL_ADDRESSES_PROVIDER.getPriceOracle())
       .getAssetPrice(asset());
-    return int256(aTokenUnderlyingAssetPrice.mulDiv(_rate(), 1e27, Math.Rounding.Floor)); // TODO: fix others
+    return int256(aTokenUnderlyingAssetPrice.mulDiv(_rate(), RAY, Math.Rounding.Floor)); // TODO: fix others
   }
 
   function _deposit(
@@ -234,7 +233,7 @@ abstract contract Stata4626Upgradable is ERC4626Upgradeable, IStata4626 {
     Math.Rounding rounding
   ) internal view virtual override returns (uint256) {
     // * @notice assets * RAY / exchangeRate
-    return assets.mulDiv(1e27, _rate(), rounding); // TODO: fix others
+    return assets.mulDiv(RAY, _rate(), rounding);
   }
 
   function _convertToAssets(
@@ -242,7 +241,7 @@ abstract contract Stata4626Upgradable is ERC4626Upgradeable, IStata4626 {
     Math.Rounding rounding
   ) internal view virtual override returns (uint256) {
     // * @notice share * exchangeRate / RAY
-    return shares.mulDiv(_rate(), 1e27, rounding); // TODO: fix others
+    return shares.mulDiv(_rate(), RAY, rounding);
   }
 
   function _rate() internal view returns (uint256) {