AA-283 L-03 Inconsistent Oracle Configuration (eth-infinitism#423)

* Requiring native oracle to be zero address if unused
MarcusDavidG · Jan 30, 2024 · 41857d5 · 41857d5
1 parent 69ef318
commit 41857d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/contracts/samples/utils/OracleHelper.sol b/contracts/samples/utils/OracleHelper.sol
@@ -29,7 +29,7 @@ abstract contract OracleHelper {
         /// @notice The Oracle contract used to fetch the latest token prices
         IOracle tokenOracle;
 
-        /// @notice The Oracle contract used to fetch the latest ETH prices
+        /// @notice The Oracle contract used to fetch the latest ETH prices. Only needed if tokenToNativeOracle flag is not set.
         IOracle nativeOracle;
 
         /// @notice If 'true' we will fetch price directly from tokenOracle
@@ -76,7 +76,12 @@ abstract contract OracleHelper {
         oracleHelperConfig = _oracleHelperConfig;
         require(_oracleHelperConfig.priceUpdateThreshold <= PRICE_DENOMINATOR, "TPM: update threshold too high");
         tokenOracleDecimalPower = uint128(10 ** oracleHelperConfig.tokenOracle.decimals());
-        nativeOracleDecimalPower = uint128(10 ** oracleHelperConfig.nativeOracle.decimals());
+        if (oracleHelperConfig.tokenToNativeOracle) {
+            require(address(oracleHelperConfig.nativeOracle) == address(0), "TPM: native oracle must be zero");
+            nativeOracleDecimalPower = 1;
+        } else {
+            nativeOracleDecimalPower = uint128(10 ** oracleHelperConfig.nativeOracle.decimals());
+        }
     }
 
     /// @notice Updates the token price by fetching the latest price from the Oracle.

diff --git a/reports/gas-checker.txt b/reports/gas-checker.txt
@@ -46,10 +46,10 @@
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
 ║ token paymaster                │     1 │        128503 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster with diff      │     2 │               │          66121 │               37142 ║
+║ token paymaster with diff      │     2 │               │          66133 │               37154 ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster                │    10 │        723935 │                │                     ║
+║ token paymaster                │    10 │        723911 │                │                     ║
 ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
-║ token paymaster with diff      │    11 │               │          66204 │               37225 ║
+║ token paymaster with diff      │    11 │               │          66192 │               37213 ║
 ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝
 
diff --git a/test/samples/OracleHelper.test.ts b/test/samples/OracleHelper.test.ts
@@ -82,7 +82,7 @@ describe('OracleHelper', function () {
       nativeOracleReverse,
       tokenOracleReverse,
       tokenToNativeOracle,
-      nativeOracle: testEnv.nativeAssetOracle.address,
+      nativeOracle: tokenToNativeOracle ? AddressZero : testEnv.nativeAssetOracle.address,
       tokenOracle: testEnv.tokenOracle.address,
       cacheTimeToLive: 0,
       maxOracleRoundAge: 0,