feat(custom-redstone): Store feed decimals

Author: hivtushok

src/oracles/providers/CustomRedStoneOracleAdapter.sol

@@ -25,7 +25,7 @@ import { Roles } from "src/libs/Roles.sol";
  * ref: https://docs.redstone.finance/docs/get-started/models/redstone-pull/#manual-payload
  */
 contract CustomRedStoneOracleAdapter is PrimaryProdDataServiceConsumerBase, SystemComponent, SecurityBase {
-    event FeedIdRegistered(bytes32 indexed feedId, address indexed tokenAddress);
+    event FeedIdRegistered(bytes32 indexed feedId, address indexed tokenAddress, bool ethQuoted, uint256 feedDecimals);
     event FeedIdRemoved(bytes32 indexed feedId);
 
     error TokenNotRegistered(bytes32 feedId, address tokenAddress);
@@ -36,6 +36,7 @@ contract CustomRedStoneOracleAdapter is PrimaryProdDataServiceConsumerBase, Syst
     struct FeedId {
         address tokenAddress;
         bool ethQuoted;
+        uint256 feedDecimals;
     }
 
     /// @notice Mapping between a Redstone feedId and token address and if the price is quoted in ETH
@@ -99,7 +100,14 @@ contract CustomRedStoneOracleAdapter is PrimaryProdDataServiceConsumerBase, Syst
 
             // Validate the price
             Errors.verifyNotZero(values[i], "baseToken price");
-            values[i] = values[i] * 10 ** 10; // Convert to ETH decimals since Redstone uses 8 decimals
+
+            // Adjust the price from the feed decimals to 18 decimals
+            uint256 feedDecimals = feedId.feedDecimals;
+            if (feedDecimals < 18) {
+                values[i] = values[i] * 10 ** (18 - feedDecimals);
+            } else if (feedDecimals > 18) {
+                values[i] = values[i] / 10 ** (feedDecimals - 18);
+            }
 
             // Convert to ETH if the data feed price is not quoted in ETH
             if (!feedId.ethQuoted) {
@@ -133,12 +141,13 @@ contract CustomRedStoneOracleAdapter is PrimaryProdDataServiceConsumerBase, Syst
     function registerFeedId(
         bytes32 feedId,
         address tokenAddress,
-        bool ethQuoted
+        bool ethQuoted,
+        uint256 feedDecimals
     ) external hasRole(Roles.ORACLE_MANAGER) {
         Errors.verifyNotZero(feedId, "feedId");
         Errors.verifyNotZero(address(tokenAddress), "tokenAddress");
-        registeredFeedIds[feedId] = FeedId(tokenAddress, ethQuoted);
-        emit FeedIdRegistered(feedId, tokenAddress);
+        registeredFeedIds[feedId] = FeedId(tokenAddress, ethQuoted, feedDecimals);
+        emit FeedIdRegistered(feedId, tokenAddress, ethQuoted, feedDecimals);
     }
 
     /// @notice Removes a mapping between a Redstone feedId and token address

test/oracles/providers/CustomRedStoneOracleAdapter.t.sol

@@ -58,7 +58,9 @@ contract CustomRedStoneOracleAdapterTest is Test {
 
     ///@dev Get the Redstone payload snapshot for a given feedId
     ///@return data The real Redstone payload from their API
-    function getRedstonePayload(bytes32 feedId) internal pure returns (bytes memory data) {
+    function getRedstonePayload(
+        bytes32 feedId
+    ) internal pure returns (bytes memory data) {
         //solhint-disable max-line-length
         if (feedId == bytes32("pxETH/ETH")) {
             data =
@@ -130,12 +132,13 @@ contract RegisterFeedId is CustomRedStoneOracleAdapterTest {
         bytes32 feedId = bytes32("TEST");
         address token = makeAddr("token");
 
-        redstoneAdapter.registerFeedId(feedId, token, true);
+        redstoneAdapter.registerFeedId(feedId, token, true, 8);
 
-        (address tokenAddress, bool ethQuoted) = redstoneAdapter.registeredFeedIds(feedId);
+        (address tokenAddress, bool ethQuoted, uint256 feedDecimals) = redstoneAdapter.registeredFeedIds(feedId);
 
         assertEq(tokenAddress, token);
         assertEq(ethQuoted, true);
+        assertEq(feedDecimals, 8);
     }
 
     function testRegisterFeedIdRevertsIfNoAccess() public {
@@ -144,7 +147,7 @@ contract RegisterFeedId is CustomRedStoneOracleAdapterTest {
 
         vm.prank(RANDOM);
         vm.expectRevert(abi.encodeWithSignature("AccessDenied()"));
-        redstoneAdapter.registerFeedId(feedId, token, true);
+        redstoneAdapter.registerFeedId(feedId, token, true, 8);
     }
 }
 
@@ -153,18 +156,18 @@ contract RemoveFeedId is CustomRedStoneOracleAdapterTest {
         bytes32 feedId = bytes32("TEST");
         address token = makeAddr("token");
 
-        redstoneAdapter.registerFeedId(feedId, token, true);
+        redstoneAdapter.registerFeedId(feedId, token, true, 8);
         redstoneAdapter.removeFeedId(feedId);
 
-        (address tokenAddress,) = redstoneAdapter.registeredFeedIds(feedId);
+        (address tokenAddress,,) = redstoneAdapter.registeredFeedIds(feedId);
         assertEq(tokenAddress, address(0));
     }
 
     function test_RemoveFeedIdRevertsIfNoAccess() public {
         bytes32 feedId = bytes32("TEST");
         address token = makeAddr("token");
 
-        redstoneAdapter.registerFeedId(feedId, token, true);
+        redstoneAdapter.registerFeedId(feedId, token, true, 8);
 
         vm.prank(RANDOM);
         vm.expectRevert(abi.encodeWithSignature("AccessDenied()"));
@@ -182,7 +185,7 @@ contract UpdatePriceWithFeedId is CustomRedStoneOracleAdapterTest {
         bytes memory encodedFunction = abi.encodeWithSignature("updatePriceWithFeedId(bytes32[])", feedIds);
         bytes memory encodedFunctionWithRedstonePayload = abi.encodePacked(encodedFunction, redstonePayload);
 
-        redstoneAdapter.registerFeedId(feedIds[0], PXETH_MAINNET, true);
+        redstoneAdapter.registerFeedId(feedIds[0], PXETH_MAINNET, true, 8);
 
         vm.prank(TREASURY);
         accessController.grantRole(Roles.CUSTOM_ORACLE_EXECUTOR, address(redstoneAdapter));
@@ -214,7 +217,7 @@ contract UpdatePriceWithFeedId is CustomRedStoneOracleAdapterTest {
     function test_UpdatePriceWithFeedIdRevertsIfFeedIdIsNotExisting() public {
         bytes32[] memory feedIds = new bytes32[](1);
         feedIds[0] = bytes32("someRandomFeedIdThatDoesNotExist");
-        redstoneAdapter.registerFeedId(feedIds[0], PXETH_MAINNET, true);
+        redstoneAdapter.registerFeedId(feedIds[0], PXETH_MAINNET, true, 8);
 
         bytes memory redstonePayload = getRedstonePayload(feedIds[0]);
         bytes memory encodedFunction = abi.encodeWithSignature("updatePriceWithFeedId(bytes32[])", feedIds);
@@ -232,7 +235,7 @@ contract UpdatePriceWithFeedId is CustomRedStoneOracleAdapterTest {
     function test_UpdatesPriceWithUsdNominatedFeedId() public {
         bytes32[] memory feedIds = new bytes32[](1);
         feedIds[0] = bytes32("CRV");
-        redstoneAdapter.registerFeedId(feedIds[0], CRV_MAINNET, false);
+        redstoneAdapter.registerFeedId(feedIds[0], CRV_MAINNET, false, 8);
 
         address[] memory tokenAddresses = new address[](1);
         tokenAddresses[0] = CRV_MAINNET;
@@ -268,7 +271,7 @@ contract UpdatePriceWithFeedId is CustomRedStoneOracleAdapterTest {
     function test_UpdatesPriceWithSingleFeedId() public {
         bytes32[] memory feedIds = new bytes32[](1);
         feedIds[0] = bytes32("pxETH/ETH");
-        redstoneAdapter.registerFeedId(feedIds[0], PXETH_MAINNET, true);
+        redstoneAdapter.registerFeedId(feedIds[0], PXETH_MAINNET, true, 8);
 
         bytes memory redstonePayload = getRedstonePayload(feedIds[0]);
         bytes memory encodedFunction = abi.encodeWithSignature("updatePriceWithFeedId(bytes32[])", feedIds);
@@ -316,9 +319,9 @@ contract UpdatePriceWithFeedId is CustomRedStoneOracleAdapterTest {
         bytes memory encodedFunction = abi.encodeWithSignature("updatePriceWithFeedId(bytes32[])", feedIds);
         bytes memory encodedFunctionWithRedstonePayload = abi.encodePacked(encodedFunction, redstonePayload);
 
-        redstoneAdapter.registerFeedId(feedIds[0], EZETH_MAINNET, true);
-        redstoneAdapter.registerFeedId(feedIds[1], WSTETH_MAINNET, true);
-        redstoneAdapter.registerFeedId(feedIds[2], RETH_MAINNET, true);
+        redstoneAdapter.registerFeedId(feedIds[0], EZETH_MAINNET, true, 8);
+        redstoneAdapter.registerFeedId(feedIds[1], WSTETH_MAINNET, true, 8);
+        redstoneAdapter.registerFeedId(feedIds[2], RETH_MAINNET, true, 8);
 
         vm.prank(TREASURY);
         accessController.grantRole(Roles.CUSTOM_ORACLE_EXECUTOR, address(redstoneAdapter));