Split maxSettlementFee into maxSyncFee and maxAsyncFee

packages/core/test/integration/helpers/setupHelpers.ts

@@ -168,7 +168,8 @@ export async function deployProtocol(chainlinkContext?: ChainlinkContext): Promi
   await oracleFactory.connect(owner).register(chainlink.oracleFactory.address)
   await oracleFactory.connect(owner).updateParameter({
     maxGranularity: 10000,
-    maxSettlementFee: parse6decimal('1000'),
+    maxAsyncFee: parse6decimal('500'),
+    maxSyncFee: parse6decimal('500'),
     maxOracleFee: parse6decimal('0.5'),
   })
   const oracle = IOracle__factory.connect(

packages/oracle/contracts/OracleFactory.sol

@@ -43,7 +43,7 @@ contract OracleFactory is IOracleFactory, Factory {
         // Re-initialize if owner is unset
         if (owner() == address(0)) __Factory__initialize();
 
-        _parameter.store(OracleParameter(1, UFixed6Lib.ZERO, UFixed6Lib.ZERO));
+        _parameter.store(OracleParameter(1, UFixed6Lib.ZERO, UFixed6Lib.ZERO, UFixed6Lib.ZERO));
     }
 
     /// @notice Returns the global oracle parameter

packages/oracle/contracts/keeper/KeeperOracle.sol

@@ -207,8 +207,8 @@ contract KeeperOracle is IKeeperOracle, Instance {
         priceResponse.asyncFee = UFixed6Lib.from(factory.settlementGasOracle().cost(0), true);
         priceResponse.oracleFee = keeperOracleParameter.oracleFee;
         priceResponse.applyFeeMaximum(
-            oracleParameter.maxSettlementFee,
-            _localCallbacks[oracleVersion.timestamp].length()
+            oracleParameter.maxSyncFee,
+            oracleParameter.maxAsyncFee
         );
 
         _responses[oracleVersion.timestamp].store(priceResponse);

packages/oracle/contracts/keeper/types/PriceResponse.sol

@@ -69,15 +69,13 @@ library PriceResponseLib {
         return self.syncFee.add(self.asyncFee.mul(UFixed6Lib.from(callbacks)));
     }
 
-    /// @notice Scales down sync and async fees if they exceed the maximum settlement fee
+    /// @notice Scales down sync and async fees if they exceed the maximums
     /// @param self The price response object
-    /// @param maxSettlementFee The maximum settlement fee
-    function applyFeeMaximum(PriceResponse memory self, UFixed6 maxSettlementFee, uint256 callbacks) internal pure {
-        UFixed6 totalSettlementFee = settlementFee(self, callbacks);
-        if (totalSettlementFee.gt(maxSettlementFee)) {
-            self.syncFee = self.syncFee.muldiv(maxSettlementFee, totalSettlementFee);
-            self.asyncFee = self.asyncFee.muldiv(maxSettlementFee, totalSettlementFee);
-        }
+    /// @param maxSyncFee The max sync fee
+    /// @param maxAsyncFee The max async fee
+    function applyFeeMaximum(PriceResponse memory self, UFixed6 maxSyncFee, UFixed6 maxAsyncFee) internal pure {
+        self.syncFee = self.syncFee.min(maxSyncFee);
+        self.asyncFee = self.asyncFee.min(maxAsyncFee);
     }
 }
 

packages/oracle/contracts/test/PriceResponseTester.sol

@@ -33,9 +33,9 @@ contract PriceResponseTester {
         return PriceResponseLib.settlementFee(self, callbacks);
     }
 
-    function applyFeeMaximum(UFixed6 maxSettlementFee, uint256 callbacks) external {
+    function applyFeeMaximum(UFixed6 maxSyncFee, UFixed6 maxAsyncFee) external {
         PriceResponse memory newPriceResponse = read();
-        newPriceResponse.applyFeeMaximum(maxSettlementFee, callbacks);
+        newPriceResponse.applyFeeMaximum(maxSyncFee, maxAsyncFee);
         store(newPriceResponse);
     }
 }

packages/oracle/contracts/types/OracleParameter.sol

@@ -7,16 +7,20 @@ struct OracleParameter {
     /// @dev The cap for the granularity setting in seconds
     uint256 maxGranularity;
 
-    /// @dev the cap for the settle fee in absolute terms
-    UFixed6 maxSettlementFee;
+    /// @dev the cap for the sync fee in absolute terms
+    UFixed6 maxSyncFee;
+
+    /// @dev the cap for the async fee in absolute terms
+    UFixed6 maxAsyncFee;
 
     /// @dev The cap for the oracle fee in relative terms
     UFixed6 maxOracleFee;
 }
 struct StoredOracleParameter {
     /* slot 0 */
     uint16 maxGranularity;      // <= 65k
-    uint48 maxSettlementFee;    // <= 281m
+    uint48 maxSyncFee;          // <= 281m
+    uint48 maxAsyncFee;         // <= 281m
     uint24 maxOracleFee;        // <= 100%
 }
 struct OracleParameterStorage { StoredOracleParameter value; }
@@ -31,7 +35,8 @@ library OracleParameterStorageLib {
         StoredOracleParameter memory storedValue = self.value;
         return OracleParameter(
             uint256(storedValue.maxGranularity),
-            UFixed6.wrap(uint256(storedValue.maxSettlementFee)),
+            UFixed6.wrap(uint256(storedValue.maxSyncFee)),
+            UFixed6.wrap(uint256(storedValue.maxAsyncFee)),
             UFixed6.wrap(uint256(storedValue.maxOracleFee))
         );
     }
@@ -45,12 +50,14 @@ library OracleParameterStorageLib {
         validate(newValue);
 
         if (newValue.maxGranularity > type(uint16).max) revert OracleParameterStorageInvalidError();
-        if (newValue.maxSettlementFee.gt(UFixed6.wrap(type(uint48).max))) revert OracleParameterStorageInvalidError();
+        if (newValue.maxSyncFee.gt(UFixed6.wrap(type(uint48).max))) revert OracleParameterStorageInvalidError();
+        if (newValue.maxAsyncFee.gt(UFixed6.wrap(type(uint48).max))) revert OracleParameterStorageInvalidError();
         if (newValue.maxOracleFee.gt(UFixed6.wrap(type(uint24).max))) revert OracleParameterStorageInvalidError();
 
         self.value = StoredOracleParameter(
             uint16(newValue.maxGranularity),
-            uint48(UFixed6.unwrap(newValue.maxSettlementFee)),
+            uint48(UFixed6.unwrap(newValue.maxSyncFee)),
+            uint48(UFixed6.unwrap(newValue.maxAsyncFee)),
             uint24(UFixed6.unwrap(newValue.maxOracleFee))
         );
     }

packages/oracle/test/integration/metaquants/MetaQuantsOracleFactory.test.ts

@@ -208,7 +208,8 @@ testOracles.forEach(testOracle => {
       await oracleFactory.initialize()
       await oracleFactory.connect(owner).updateParameter({
         maxGranularity: 10000,
-        maxSettlementFee: parse6decimal('1000'),
+        maxSyncFee: parse6decimal('500'),
+        maxAsyncFee: parse6decimal('500'),
         maxOracleFee: parse6decimal('0.5'),
       })
 

packages/oracle/test/integration/pyth/PythOracleFactory.test.ts

@@ -135,7 +135,8 @@ testOracles.forEach(testOracle => {
       await oracleFactory.initialize()
       await oracleFactory.connect(owner).updateParameter({
         maxGranularity: 10000,
-        maxSettlementFee: parse6decimal('1000'),
+        maxSyncFee: parse6decimal('500'),
+        maxAsyncFee: parse6decimal('500'),
         maxOracleFee: parse6decimal('0.5'),
       })
 

packages/oracle/test/integrationSepolia/chainlink/ChainlinkOracleFactory.test.ts

@@ -184,7 +184,8 @@ testOracles.forEach(testOracle => {
       await oracleFactory.initialize()
       await oracleFactory.connect(owner).updateParameter({
         maxGranularity: 10000,
-        maxSettlementFee: parse6decimal('1000'),
+        maxSyncFee: parse6decimal('500'),
+        maxAsyncFee: parse6decimal('500'),
         maxOracleFee: parse6decimal('0.5'),
       })
 

packages/oracle/test/unit/types/OracleParameter.ts

@@ -11,7 +11,8 @@ const { ethers } = HRE
 
 const DEFAULT_ORACLE_PARAMETER: OracleParameterStruct = {
   maxGranularity: 1,
-  maxSettlementFee: 0,
+  maxSyncFee: 0,
+  maxAsyncFee: 0,
   maxOracleFee: 0,
 }
 
@@ -65,22 +66,43 @@ describe('OracleParameter', () => {
       })
     })
 
-    context('.maxSettlementFee', async () => {
+    context('.maxSyncFee', async () => {
       const STORAGE_SIZE = 48
       it('saves if in range', async () => {
         await oracleParameter.store({
           ...DEFAULT_ORACLE_PARAMETER,
-          maxSettlementFee: BigNumber.from(2).pow(STORAGE_SIZE).sub(1),
+          maxSyncFee: BigNumber.from(2).pow(STORAGE_SIZE).sub(1),
         })
         const value = await oracleParameter.read()
-        expect(value.maxSettlementFee).to.equal(BigNumber.from(2).pow(STORAGE_SIZE).sub(1))
+        expect(value.maxSyncFee).to.equal(BigNumber.from(2).pow(STORAGE_SIZE).sub(1))
       })
 
-      it('reverts if maxSettlementFee out of range', async () => {
+      it('reverts if maxSyncFee out of range', async () => {
         await expect(
           oracleParameter.store({
             ...DEFAULT_ORACLE_PARAMETER,
-            maxSettlementFee: BigNumber.from(2).pow(STORAGE_SIZE),
+            maxSyncFee: BigNumber.from(2).pow(STORAGE_SIZE),
+          }),
+        ).to.be.revertedWithCustomError(oracleParameter, 'OracleParameterStorageInvalidError')
+      })
+    })
+
+    context('.maxAsyncFee', async () => {
+      const STORAGE_SIZE = 48
+      it('saves if in range', async () => {
+        await oracleParameter.store({
+          ...DEFAULT_ORACLE_PARAMETER,
+          maxAsyncFee: BigNumber.from(2).pow(STORAGE_SIZE).sub(1),
+        })
+        const value = await oracleParameter.read()
+        expect(value.maxAsyncFee).to.equal(BigNumber.from(2).pow(STORAGE_SIZE).sub(1))
+      })
+
+      it('reverts if maxAsyncFee out of range', async () => {
+        await expect(
+          oracleParameter.store({
+            ...DEFAULT_ORACLE_PARAMETER,
+            maxAsyncFee: BigNumber.from(2).pow(STORAGE_SIZE),
           }),
         ).to.be.revertedWithCustomError(oracleParameter, 'OracleParameterStorageInvalidError')
       })

packages/oracle/test/unit/types/PriceResponse.test.ts

@@ -304,90 +304,54 @@ describe('PriceResponse', () => {
       await priceResponse.store({
         ...DEFAULT_PRICE_RESPONSE,
         syncFee: parse6decimal('1'),
-        asyncFee: parse6decimal('0.2'),
+        asyncFee: parse6decimal('0'),
       })
 
-      await priceResponse.applyFeeMaximum(parse6decimal('0.5'), 0)
-
-      const value = await priceResponse.read()
-
-      expect(value.syncFee).to.equal(parse6decimal('0.5'))
-      expect(value.asyncFee).to.equal(parse6decimal('0.1'))
-    })
-
-    it('calculates correct fee w/ non-zero sync, single async', async () => {
-      await priceResponse.store({
-        ...DEFAULT_PRICE_RESPONSE,
-        syncFee: parse6decimal('1'),
-        asyncFee: parse6decimal('0.2'),
-      })
+      const maxSyncFee = parse6decimal('0.3')
+      const maxAsyncFee = parse6decimal('0.1')
 
-      await priceResponse.applyFeeMaximum(parse6decimal('0.6'), 1)
+      await priceResponse.applyFeeMaximum(maxSyncFee, maxAsyncFee)
 
       const value = await priceResponse.read()
 
-      expect(value.syncFee).to.equal(parse6decimal('0.5'))
-      expect(value.asyncFee).to.equal(parse6decimal('0.1'))
+      expect(value.syncFee).to.equal(parse6decimal('0.3'))
+      expect(value.asyncFee).to.equal(parse6decimal('0'))
     })
 
-    it('calculates correct fee w/ non-zero sync, multiple async', async () => {
+    it('calculates correct fee w/ non-zero sync, non-zero async', async () => {
       await priceResponse.store({
         ...DEFAULT_PRICE_RESPONSE,
         syncFee: parse6decimal('1'),
         asyncFee: parse6decimal('0.2'),
       })
 
-      await priceResponse.applyFeeMaximum(parse6decimal('1.0'), 5)
+      const maxSyncFee = parse6decimal('0.3')
+      const maxAsyncFee = parse6decimal('0.1')
+
+      await priceResponse.applyFeeMaximum(maxSyncFee, maxAsyncFee)
 
       const value = await priceResponse.read()
 
-      expect(value.syncFee).to.equal(parse6decimal('0.5'))
+      expect(value.syncFee).to.equal(parse6decimal('0.3'))
       expect(value.asyncFee).to.equal(parse6decimal('0.1'))
     })
 
     it('calculates correct fee w/ zero sync, zero async', async () => {
       await priceResponse.store({
         ...DEFAULT_PRICE_RESPONSE,
         syncFee: parse6decimal('0'),
-        asyncFee: parse6decimal('0.2'),
-      })
-
-      await priceResponse.applyFeeMaximum(parse6decimal('0.0'), 0)
-
-      const value = await priceResponse.read()
-
-      expect(value.syncFee).to.equal(parse6decimal('0'))
-      expect(value.asyncFee).to.equal(parse6decimal('0.2'))
-    })
-
-    it('calculates correct fee w/ zero sync, single async', async () => {
-      await priceResponse.store({
-        ...DEFAULT_PRICE_RESPONSE,
-        syncFee: parse6decimal('0'),
-        asyncFee: parse6decimal('0.2'),
+        asyncFee: parse6decimal('0'),
       })
 
-      await priceResponse.applyFeeMaximum(parse6decimal('0.1'), 1)
-
-      const value = await priceResponse.read()
-
-      expect(value.syncFee).to.equal(parse6decimal('0.0'))
-      expect(value.asyncFee).to.equal(parse6decimal('0.1'))
-    })
+      const maxSyncFee = parse6decimal('0.3')
+      const maxAsyncFee = parse6decimal('0.1')
 
-    it('calculates correct fee w/ zero sync, multiple async', async () => {
-      await priceResponse.store({
-        ...DEFAULT_PRICE_RESPONSE,
-        syncFee: parse6decimal('0'),
-        asyncFee: parse6decimal('0.2'),
-      })
-
-      await priceResponse.applyFeeMaximum(parse6decimal('0.5'), 5)
+      await priceResponse.applyFeeMaximum(maxSyncFee, maxAsyncFee)
 
       const value = await priceResponse.read()
 
-      expect(value.syncFee).to.equal(parse6decimal('0.0'))
-      expect(value.asyncFee).to.equal(parse6decimal('0.1'))
+      expect(value.syncFee).to.equal(parse6decimal('0'))
+      expect(value.asyncFee).to.equal(parse6decimal('0'))
     })
   })
 })

packages/periphery/test/integration/MultiInvoker/Pyth.test.ts

@@ -53,7 +53,8 @@ export function RunPythOracleTests(
 
       await oracleFactory.updateParameter({
         maxGranularity: 1,
-        maxSettlementFee: parse6decimal('1.5'),
+        maxSyncFee: parse6decimal('1'),
+        maxAsyncFee: parse6decimal('1'),
         maxOracleFee: parse6decimal('0.5'),
       })
       ;[pythOracleFactory, keeperOracle] = await getKeeperOracle()