test: clean up; add more for new aggregator

Author: yan-man

tests/horizon/OracleDynamicBounds.t.sol

@@ -1,14 +1,32 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
+import {console2 as console} from 'forge-std/console2.sol';
+
 import {Test, Vm} from 'forge-std/Test.sol';
+import {IAaveOracle} from '../../src/contracts/interfaces/IAaveOracle.sol';
+import {IPool} from '../../src/contracts/interfaces/IPool.sol';
+import {AggregatorInterface} from '../../src/contracts/dependencies/chainlink/AggregatorInterface.sol';
+
 import {AaveV3HorizonEthereum} from './utils/AaveV3HorizonEthereum.sol';
 
 /// forge-config: default.evm_version = "cancun"
 contract OracleDynamicBoundsTest is Test {
-  function setUp() public {
-    vm.createSelectFork('mainnet', 23469081);
-  }
+  address constant USTB_NEW_AGGREGATOR = 0x267D0DD05fbc989565C521e0B8882f61027FF32A;
+  address constant USCC_NEW_AGGREGATOR = 0x2d7Cd12f24bD28684847bF3e4317899a4Db53c58;
+  address constant USYC_NEW_AGGREGATOR = 0x3C405e1FE8a6BE5d9b714B8C88Ad913F236B1639;
+  address constant JTRSY_NEW_AGGREGATOR = 0xcf8683fFdFC4b871DF35D05bc763F239612e7272;
+  address constant JAAA_NEW_AGGREGATOR = 0x3a8E8491236368a582b651786bEdA49BD5c3BA7B;
+  address constant VBILL_NEW_AGGREGATOR = 0x04d81C346252E31Ee888393AF6E2037a9a4d70Af;
+
+  // read admin addresses found on-chain
+  address constant USTB_READ_ADMIN = 0x47Fb2585D2C56Fe188D0E6ec628a38b74fCeeeDf;
+  address constant USCC_READ_ADMIN = 0x69D55D504BC9556E377b340D19818E736bbB318b;
+  address constant USYC_READ_ADMIN = 0x69D55D504BC9556E377b340D19818E736bbB318b;
+  address constant JTRSY_READ_ADMIN = 0x47Fb2585D2C56Fe188D0E6ec628a38b74fCeeeDf;
+  address constant JAAA_READ_ADMIN = 0x69D55D504BC9556E377b340D19818E736bbB318b;
+  address constant VBILL_READ_ADMIN = 0x5ed77a9D9b7cc80E9d0D7711024AF38C2643C1c4;
+
   struct ExpectedParams {
     uint64 maxExpectedApy;
     uint32 upperBoundTolerance;
@@ -20,6 +38,56 @@ contract OracleDynamicBoundsTest is Test {
     bool isActionTakingEnabled;
   }
 
+  struct NewAggregator {
+    address aggregator;
+    address readAdmin;
+  }
+
+  mapping(address => ExpectedParams) internal expectedParams; // asset => expected params
+  mapping(address => NewAggregator) internal newAggregators; // asset => new aggregator address
+
+  IAaveOracle internal oracle;
+  function setUp() public {
+    vm.createSelectFork('mainnet', 23469081);
+    _initEnvironment();
+  }
+
+  function _initEnvironment() internal {
+    expectedParams[AaveV3HorizonEthereum.USTB_ADDRESS] = USTB_EXPECTED_PARAMS;
+    expectedParams[AaveV3HorizonEthereum.USCC_ADDRESS] = USCC_EXPECTED_PARAMS;
+    expectedParams[AaveV3HorizonEthereum.USYC_ADDRESS] = USYC_EXPECTED_PARAMS;
+    expectedParams[AaveV3HorizonEthereum.JTRSY_ADDRESS] = JTRSY_EXPECTED_PARAMS;
+    expectedParams[AaveV3HorizonEthereum.JAAA_ADDRESS] = JAAA_EXPECTED_PARAMS;
+    expectedParams[AaveV3HorizonEthereum.VBILL_ADDRESS] = VBILL_EXPECTED_PARAMS;
+
+    newAggregators[AaveV3HorizonEthereum.USTB_ADDRESS] = NewAggregator({
+      aggregator: USTB_NEW_AGGREGATOR,
+      readAdmin: USTB_READ_ADMIN
+    });
+    newAggregators[AaveV3HorizonEthereum.USCC_ADDRESS] = NewAggregator({
+      aggregator: USCC_NEW_AGGREGATOR,
+      readAdmin: USCC_READ_ADMIN
+    });
+    newAggregators[AaveV3HorizonEthereum.USYC_ADDRESS] = NewAggregator({
+      aggregator: USYC_NEW_AGGREGATOR,
+      readAdmin: USYC_READ_ADMIN
+    });
+    newAggregators[AaveV3HorizonEthereum.JTRSY_ADDRESS] = NewAggregator({
+      aggregator: JTRSY_NEW_AGGREGATOR,
+      readAdmin: JTRSY_READ_ADMIN
+    });
+    newAggregators[AaveV3HorizonEthereum.JAAA_ADDRESS] = NewAggregator({
+      aggregator: JAAA_NEW_AGGREGATOR,
+      readAdmin: JAAA_READ_ADMIN
+    });
+    newAggregators[AaveV3HorizonEthereum.VBILL_ADDRESS] = NewAggregator({
+      aggregator: VBILL_NEW_AGGREGATOR,
+      readAdmin: VBILL_READ_ADMIN
+    });
+
+    oracle = IAaveOracle(IPool(AaveV3HorizonEthereum.POOL).ADDRESSES_PROVIDER().getPriceOracle());
+  }
+
   ExpectedParams internal USTB_EXPECTED_PARAMS =
     ExpectedParams({
       maxExpectedApy: 415,
@@ -103,67 +171,44 @@ contract OracleDynamicBoundsTest is Test {
     assertEq(updater, AaveV3HorizonEthereum.HORIZON_OPS, 'updater');
   }
 
-  function test_ustb_oracle() external {
-    test_horizon_adapter(
-      AaveV3HorizonEthereum.USTB_ADDRESS,
-      AaveV3HorizonEthereum.USTB_PRICE_FEED_ADAPTER,
-      true
-    );
-    test_registry_params(AaveV3HorizonEthereum.USTB_ADDRESS, USTB_EXPECTED_PARAMS);
-    test_lookback_data(AaveV3HorizonEthereum.USTB_ADDRESS);
+  function test_ustb() external {
+    address oracleSource = oracle.getSourceOfAsset(AaveV3HorizonEthereum.USTB_ADDRESS);
+    test_asset(AaveV3HorizonEthereum.USTB_ADDRESS, oracleSource, true);
   }
 
-  function test_uscc_oracle() external {
-    test_horizon_adapter(
-      AaveV3HorizonEthereum.USCC_ADDRESS,
-      AaveV3HorizonEthereum.USCC_PRICE_FEED_ADAPTER,
-      true
-    );
-    test_registry_params(AaveV3HorizonEthereum.USCC_ADDRESS, USCC_EXPECTED_PARAMS);
-    test_lookback_data(AaveV3HorizonEthereum.USCC_ADDRESS);
+  function test_uscc() external {
+    address oracleSource = oracle.getSourceOfAsset(AaveV3HorizonEthereum.USCC_ADDRESS);
+    test_asset(AaveV3HorizonEthereum.USCC_ADDRESS, oracleSource, true);
   }
 
-  function test_usyc_oracle() external {
-    test_horizon_adapter(
-      AaveV3HorizonEthereum.USYC_ADDRESS,
-      AaveV3HorizonEthereum.USYC_PRICE_FEED,
-      false
-    );
-    test_registry_params(AaveV3HorizonEthereum.USYC_ADDRESS, USYC_EXPECTED_PARAMS);
-    test_lookback_data(AaveV3HorizonEthereum.USYC_ADDRESS);
+  function test_usyc() external {
+    address oracleSource = oracle.getSourceOfAsset(AaveV3HorizonEthereum.USYC_ADDRESS);
+    test_asset(AaveV3HorizonEthereum.USYC_ADDRESS, oracleSource, false);
   }
 
-  function test_jtrsy_oracle() external {
-    test_horizon_adapter(
-      AaveV3HorizonEthereum.JTRSY_ADDRESS,
-      AaveV3HorizonEthereum.JTRSY_PRICE_FEED_ADAPTER,
-      true
-    );
-    test_registry_params(AaveV3HorizonEthereum.JTRSY_ADDRESS, JTRSY_EXPECTED_PARAMS);
-    test_lookback_data(AaveV3HorizonEthereum.JTRSY_ADDRESS);
+  function test_jtrsy() external {
+    address oracleSource = oracle.getSourceOfAsset(AaveV3HorizonEthereum.JTRSY_ADDRESS);
+    test_asset(AaveV3HorizonEthereum.JTRSY_ADDRESS, oracleSource, true);
   }
 
-  function test_jaaa_oracle() external {
-    test_horizon_adapter(
-      AaveV3HorizonEthereum.JAAA_ADDRESS,
-      AaveV3HorizonEthereum.JAAA_PRICE_FEED_ADAPTER,
-      true
-    );
-    test_registry_params(AaveV3HorizonEthereum.JAAA_ADDRESS, JAAA_EXPECTED_PARAMS);
-    test_lookback_data(AaveV3HorizonEthereum.JAAA_ADDRESS);
+  function test_jaaa() external {
+    address oracleSource = oracle.getSourceOfAsset(AaveV3HorizonEthereum.JAAA_ADDRESS);
+    test_asset(AaveV3HorizonEthereum.JAAA_ADDRESS, oracleSource, true);
   }
 
   function test_vbill() external {
-    test_horizon_adapter(
-      AaveV3HorizonEthereum.VBILL_ADDRESS,
-      AaveV3HorizonEthereum.VBILL_PRICE_FEED,
-      false
-    );
-    test_registry_params(AaveV3HorizonEthereum.VBILL_ADDRESS, VBILL_EXPECTED_PARAMS);
-    test_lookback_data(AaveV3HorizonEthereum.VBILL_ADDRESS);
+    // VBILL not deployed yet, get price feed directly from lib
+    test_asset(AaveV3HorizonEthereum.VBILL_ADDRESS, AaveV3HorizonEthereum.VBILL_PRICE_FEED, false);
   }
 
-  function test_registry_params(address asset, ExpectedParams memory expectedParams) internal {
+  function test_asset(address asset, address oracleSource, bool isAdapter) internal {
+    test_horizon_adapter(asset, oracleSource, isAdapter);
+    test_registry_params(asset);
+    test_lookback_data(asset);
+    test_new_aggregator(asset);
+  }
+
+  function test_registry_params(address asset) internal {
     bool success;
     bytes memory data;
 
@@ -179,6 +224,8 @@ contract OracleDynamicBoundsTest is Test {
     );
     require(success, 'Failed to call getParametersForAsset()');
 
+    ExpectedParams memory expectedParam = expectedParams[asset];
+
     (
       uint64 maxExpectedApy,
       uint32 upperBoundTolerance,
@@ -190,36 +237,31 @@ contract OracleDynamicBoundsTest is Test {
       bool isActionTakingEnabled
     ) = abi.decode(data, (uint64, uint32, uint32, uint32, uint80, bool, bool, bool));
 
-    assertEq(maxExpectedApy, expectedParams.maxExpectedApy, 'maxExpectedApy');
-    assertEq(upperBoundTolerance, expectedParams.upperBoundTolerance, 'upperBoundTolerance');
-    assertEq(lowerBoundTolerance, expectedParams.lowerBoundTolerance, 'lowerBoundTolerance');
-    assertEq(maxDiscount, expectedParams.maxDiscount, 'maxDiscount');
-    assertEq(lookbackWindowSize, expectedParams.lookbackWindowSize, 'lookbackWindowSize');
-    assertEq(isUpperBoundEnabled, expectedParams.isUpperBoundEnabled, 'isUpperBoundEnabled');
-    assertEq(isLowerBoundEnabled, expectedParams.isLowerBoundEnabled, 'isLowerBoundEnabled');
-    assertEq(isActionTakingEnabled, expectedParams.isActionTakingEnabled, 'isActionTakingEnabled');
+    assertEq(maxExpectedApy, expectedParam.maxExpectedApy, 'maxExpectedApy');
+    assertEq(upperBoundTolerance, expectedParam.upperBoundTolerance, 'upperBoundTolerance');
+    assertEq(lowerBoundTolerance, expectedParam.lowerBoundTolerance, 'lowerBoundTolerance');
+    assertEq(maxDiscount, expectedParam.maxDiscount, 'maxDiscount');
+    assertEq(lookbackWindowSize, expectedParam.lookbackWindowSize, 'lookbackWindowSize');
+    assertEq(isUpperBoundEnabled, expectedParam.isUpperBoundEnabled, 'isUpperBoundEnabled');
+    assertEq(isLowerBoundEnabled, expectedParam.isLowerBoundEnabled, 'isLowerBoundEnabled');
+    assertEq(isActionTakingEnabled, expectedParam.isActionTakingEnabled, 'isActionTakingEnabled');
   }
 
-  function test_horizon_adapter(address asset, address source, bool isAdapter) internal {
+  /// test that the oracle source from horizon adapter/oracle source is the same as the oracle address from the param registry
+  function test_horizon_adapter(address asset, address oracleSource, bool isAdapter) internal {
     bool success;
     bytes memory data;
     if (isAdapter) {
-      // oracle source from horizon adapter
-      (success, data) = source.call(abi.encodeWithSignature('source()'));
+      // if adapter, get oracle source from horizon adapter source
+      (success, data) = oracleSource.call(abi.encodeWithSignature('source()'));
       require(success, 'Failed to call source()');
-      source = abi.decode(data, (address));
+      oracleSource = abi.decode(data, (address));
     }
-
-    // oracle address from param registry
-    (success, data) = AaveV3HorizonEthereum.PARAM_REGISTRY.call(
-      abi.encodeWithSignature('getOracle(address)', asset)
-    );
-    require(success, 'Failed to call getOracle()');
-    address oracle = abi.decode(data, (address));
-
-    assertEq(source, oracle, 'source');
+    address oracle = _getParamRegistryOracle(asset);
+    assertEq(oracleSource, oracle, 'source');
   }
 
+  // read look back data from param registry
   function test_lookback_data(address asset) internal {
     bool success;
     bytes memory data;
@@ -229,6 +271,7 @@ contract OracleDynamicBoundsTest is Test {
     );
     require(success, 'Failed to call getLookbackData()');
 
+    // reads from old aggregator data
     (
       uint80 roundId,
       int256 answer,
@@ -239,8 +282,56 @@ contract OracleDynamicBoundsTest is Test {
 
     assertGt(roundId, 0, 'roundId');
     assertGt(answer, 0, 'answer');
-    assertApproxEqRel(startedAt, vm.getBlockTimestamp() - 4 * 1 days, 1e14, 'startedAt');
-    assertApproxEqRel(updatedAt, vm.getBlockTimestamp() - 4 * 1 days, 1e14, 'updatedAt');
+    assertApproxEqRel(
+      startedAt,
+      vm.getBlockTimestamp() - expectedParams[asset].lookbackWindowSize * 1 days, // within expected lookback window
+      1e15,
+      'startedAt'
+    );
+    assertApproxEqRel(
+      updatedAt,
+      vm.getBlockTimestamp() - expectedParams[asset].lookbackWindowSize * 1 days, // within expected lookback window
+      1e15,
+      'updatedAt'
+    );
     assertGt(answeredInRound, 0, 'answeredInRound');
   }
+
+  function test_new_aggregator(address asset) internal {
+    // new aggregator data
+
+    vm.prank(newAggregators[asset].readAdmin); // has access to price feed
+    (
+      uint80 roundId,
+      int256 answer,
+      uint256 startedAt,
+      uint256 updatedAt,
+      uint80 answeredInRound
+    ) = AggregatorInterface(newAggregators[asset].aggregator).latestRoundData();
+
+    assertGt(roundId, expectedParams[asset].lookbackWindowSize, 'roundId');
+    assertGt(answer, 0, 'answer');
+    assertApproxEqRel(
+      startedAt,
+      vm.getBlockTimestamp() - expectedParams[asset].lookbackWindowSize * 1 days, // within expected lookback window
+      1e15,
+      'startedAt'
+    );
+    assertApproxEqRel(
+      updatedAt,
+      vm.getBlockTimestamp() - expectedParams[asset].lookbackWindowSize * 1 days, // within expected lookback window
+      1e15,
+      'updatedAt'
+    );
+    assertGt(answeredInRound, expectedParams[asset].lookbackWindowSize, 'answeredInRound');
+  }
+
+  // read oracle address from param registry
+  function _getParamRegistryOracle(address asset) internal returns (address) {
+    (bool success, bytes memory data) = AaveV3HorizonEthereum.PARAM_REGISTRY.call(
+      abi.encodeWithSignature('getOracle(address)', asset)
+    );
+    require(success, 'Failed to call getOracle()');
+    return abi.decode(data, (address));
+  }
 }