fix: post audit fixes

woof-software · Jul 9, 2024 · 80f08d1 · 80f08d1
1 parent 2c33985
commit 80f08d1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/contracts/pricefeeds/RateBasedScalingPriceFeed.sol b/contracts/pricefeeds/RateBasedScalingPriceFeed.sol
@@ -13,9 +13,10 @@ import "../IRateProvider.sol";
 contract RateBasedScalingPriceFeed is IPriceFeed {
     /** Custom errors **/
     error InvalidInt256();
+    error BadDecimals();
 
     /// @notice Version of the price feed
-    uint public constant override version = 1;
+    uint public constant VERSION = 1;
 
     /// @notice Description of the price feed
     string public description;
@@ -39,6 +40,7 @@ contract RateBasedScalingPriceFeed is IPriceFeed {
      **/
     constructor(address underlyingPriceFeed_, uint8 decimals_, uint8 underlyingDecimals_, string memory description_) {
         underlyingPriceFeed = underlyingPriceFeed_;
+        if (decimals_ > 18) revert BadDecimals();
         decimals = decimals_;
         description = description_;
 
@@ -67,7 +69,7 @@ contract RateBasedScalingPriceFeed is IPriceFeed {
         uint80 answeredInRound
     ) {
         uint256 rate = IRateProvider(underlyingPriceFeed).getRate();
-        return (roundId, scalePrice(int256(rate)), startedAt, updatedAt, answeredInRound);
+        return (1, scalePrice(signed256(rate)), block.timestamp, block.timestamp, 1);
     }
 
     function signed256(uint256 n) internal pure returns (int256) {
@@ -84,4 +86,12 @@ contract RateBasedScalingPriceFeed is IPriceFeed {
         }
         return scaledPrice;
     }
+
+    /**
+     * @notice Contract version
+     * @return The version of the price feed contract
+     **/
+    function version() external pure returns (uint256) {
+        return VERSION;
+    }
 }
diff --git a/contracts/pricefeeds/RsETHScalingPriceFeed.sol b/contracts/pricefeeds/RsETHScalingPriceFeed.sol
@@ -13,9 +13,10 @@ import "../IPriceFeed.sol";
 contract rsETHScalingPriceFeed is IPriceFeed {
     /** Custom errors **/
     error InvalidInt256();
+    error BadDecimals();
 
     /// @notice Version of the price feed
-    uint public constant override version = 1;
+    uint public constant VERSION = 1;
 
     /// @notice Description of the price feed
     string public description;
@@ -39,6 +40,7 @@ contract rsETHScalingPriceFeed is IPriceFeed {
      **/
     constructor(address underlyingPriceFeed_, uint8 decimals_, string memory description_) {
         underlyingPriceFeed = underlyingPriceFeed_;
+        if (decimals_ > 18) revert BadDecimals();
         decimals = decimals_;
         description = description_;
 
@@ -66,8 +68,8 @@ contract rsETHScalingPriceFeed is IPriceFeed {
         uint256 updatedAt,
         uint80 answeredInRound
     ) {
-        int256 price = int256(ILRTOracle(underlyingPriceFeed).rsETHPrice());
-        return (roundId, scalePrice(price), startedAt, updatedAt, answeredInRound);
+        int256 price = signed256(ILRTOracle(underlyingPriceFeed).rsETHPrice());
+        return (1, scalePrice(price), block.timestamp, block.timestamp, 1);        
     }
 
     function signed256(uint256 n) internal pure returns (int256) {
@@ -84,4 +86,12 @@ contract rsETHScalingPriceFeed is IPriceFeed {
         }
         return scaledPrice;
     }
+
+    /**
+     * @notice Contract version
+     * @return The version of the price feed contract
+     **/
+    function version() external pure returns (uint256) {
+        return VERSION;
+    }
 }