add wrappers

Author: 0xtj24

src/feeds/PriceFeedNoStale.sol

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import "src/interfaces/IChainlinkFeed.sol";
+
+contract PriceFeedNoStale {
+    IChainlinkFeed public immutable feed;
+    string public description;
+
+    constructor(
+        address _feed
+    ) {
+        feed = IChainlinkFeed(_feed);
+        require(feed.decimals() == 18, "Wrong Decimals");
+        description = feed.description();
+    }
+
+    /**
+     * @notice Retrieves the latest round data for the asset token price feed
+     * @return roundId Will return 0
+     * @return usdPrice The latest asset price in USD with 18 decimals
+     * @return startedAt Will return 0
+     * @return updatedAt Will return block.timestamp
+     * @return answeredInRound Will return 0
+     */
+    function latestRoundData()
+        public
+        view
+        returns (
+            uint80 roundId,
+            int256 usdPrice,
+            uint256 startedAt,
+            uint256 updatedAt,
+            uint80 answeredInRound
+        )
+    {
+        return (0, feed.latestAnswer(), 0, block.timestamp, 0 );
+    }
+
+    /**
+     * @notice Returns the latest price only
+     * @dev Unlike chainlink oracles, the latestAnswer will always be the same as in the latestRoundData
+     * @return int256 Returns the last finalized price of the chainlink oracle
+     */
+    function latestAnswer() external view returns (int256) {
+        return feed.latestAnswer();
+    }
+
+    function decimals() external pure returns (uint8) {
+        return 18;
+    }
+}

src/feeds/PriceFeedNoStaleBasic.sol

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import "src/interfaces/IChainlinkFeed.sol";
+
+contract PriceFeedNoStaleBasic {
+    IChainlinkFeed public immutable vaultFeed;
+    IChainlinkFeed public immutable assetToUsd;
+    string public description;
+
+    constructor(
+        address _vaultFeed,
+        address _assetToUsd
+    ) {
+        vaultFeed = IChainlinkFeed(_vaultFeed);
+        assetToUsd = IChainlinkFeed(_assetToUsd);
+        require(vaultFeed.decimals() == 18 && assetToUsd.decimals() == 18);
+        description = string(abi.encodePacked(vaultFeed.description(), " * (", assetToUsd.description(),")"));
+    }
+
+    /**
+     * @notice Retrieves the latest round data for the asset token price feed
+     * @return roundId Will return 0
+     * @return usdPrice The latest asset price in USD with 18 decimals
+     * @return startedAt Will return 0
+     * @return updatedAt Will return block.timestamp
+     * @return answeredInRound Will return 0
+     */
+    function latestRoundData()
+        public
+        view
+        returns (
+            uint80 roundId,
+            int256 usdPrice,
+            uint256 startedAt,
+            uint256 updatedAt,
+            uint80 answeredInRound
+        )
+    {
+        uint256 vaultPrice = uint(vaultFeed.latestAnswer());
+        uint256 assetToUsdPrice = uint(assetToUsd.latestAnswer());
+        usdPrice = int(vaultPrice * assetToUsdPrice / 1e18);
+        return (0, usdPrice, 0, block.timestamp, 0 );
+    }
+
+    /**
+     * @notice Returns the latest price only
+     * @dev Unlike chainlink oracles, the latestAnswer will always be the same as in the latestRoundData
+     * @return int256 Returns the last finalized price of the chainlink oracle
+     */
+    function latestAnswer() external view returns (int256) {
+        (, int price, , ,) = latestRoundData(); 
+        return price;
+    }
+
+    function decimals() external pure returns (uint8) {
+        return 18;
+    }
+}

test/feedForkTests/WOETH.t.sol

@@ -6,15 +6,18 @@ import {ERC4626Feed, IERC4626} from "src/feeds/ERC4626Feed.sol";
 import {ChainlinkBridgeAssetFeed} from "src/feeds/ChainlinkBridgeAssetFeed.sol";
 import {ChainlinkBridgeAssetBase} from "test/feedForkTests/ChainlinkBridgeAssetBase.t.sol";
 import {ChainlinkBasePriceFeed} from "src/feeds/ChainlinkBasePriceFeed.sol";
-
+import {PriceFeedNoStale} from "src/feeds/PriceFeedNoStale.sol";
+import {PriceFeedNoStaleBasic} from "src/feeds/PriceFeedNoStaleBasic.sol";
 import "forge-std/console2.sol";
 
 
-contract WOETHFeed is ChainlinkBridgeAssetBase {
+contract WOETHFeedTest is ChainlinkBridgeAssetBase {
     ERC4626Feed vaultFeed;
     ChainlinkBasePriceFeed ethWrapper;
     ChainlinkBasePriceFeed oEthToEthWrapper;
-    
+    PriceFeedNoStale feedNoStale;
+    PriceFeedNoStaleBasic feedNoStaleBasic;
+
     address oEthToEth = 0x703118C4CbccCBF2AB31913e0f8075fbbb15f563;
     address wOeth = 0xDcEe70654261AF21C44c093C300eD3Bb97b78192;
     address ethToUsd = 0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419;
@@ -26,6 +29,9 @@ contract WOETHFeed is ChainlinkBridgeAssetBase {
         vaultFeed = new ERC4626Feed(wOeth, address(oEthToEthWrapper));
         ethWrapper = new ChainlinkBasePriceFeed(address(this),ethToUsd, address(0), 3600);
         init(address(vaultFeed), address(ethWrapper), true);
+        feedNoStale = new PriceFeedNoStale(address(feed));
+        feedNoStaleBasic = new PriceFeedNoStaleBasic(address(vaultFeed),address(ethWrapper));
+
     }
 
     function test_woEth() public {
@@ -37,4 +43,20 @@ contract WOETHFeed is ChainlinkBridgeAssetBase {
         assertEq(woEthToUsdPrice, uint(feed.latestAnswer()));
         console2.log(uint(feed.latestAnswer()));
     }
+
+    function test_feedNoStale() public {
+        assertEq(feed.latestAnswer(), feedNoStale.latestAnswer());
+        (,int price, , uint updateAt,) = feedNoStale.latestRoundData();
+        assertEq(updateAt, block.timestamp);
+        assertEq(price, feed.latestAnswer());
+        console2.log(feedNoStaleBasic.description());
+    }
+
+    function test_feedNoStaleBasic() public {
+        assertEq(feed.latestAnswer(), feedNoStaleBasic.latestAnswer());
+        (,int price, , uint updateAt,) = feedNoStaleBasic.latestRoundData();
+        assertEq(updateAt, block.timestamp);
+        assertEq(price, feed.latestAnswer());
+        console2.log(feedNoStaleBasic.description());
+    }
 }