Merge pull request #417 from stabilitydao/revenue-router

🧑‍🔧 RevenueRouter 1.7.0: improve; fix warnings

Author: a17

script/deploy-periphery/LiquidationBotUpdate.Sonic.s.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.23;
 
 import {Script} from "forge-std/Script.sol";
-import {Proxy} from "../../src/core/proxy/Proxy.sol";
 import {LiquidationBot} from "../../src/periphery/LiquidationBot.sol";
 
 contract DeployLiquidationBotUpdate is Script {

src/adapters/AlgebraAdapter.sol

@@ -84,7 +84,7 @@ contract AlgebraAdapter is Controllable, ICAmmAdapter {
                     tokenIn == token0,
                     int(amount),
                     tokenIn == token0 ? UniswapV3MathLib.MIN_SQRT_RATIO : UniswapV3MathLib.MAX_SQRT_RATIO,
-                    abi.encode(SwapCallbackData(tokenIn, amount))
+                    abi.encode(SwapCallbackData({tokenIn: tokenIn, amount: amount}))
                 );
 
             uint priceAfter = getPrice(pool, tokenIn, tokenOut, amount);

src/adapters/AlgebraV4Adapter.sol

@@ -87,7 +87,7 @@ contract AlgebraV4Adapter is Controllable, ICAmmAdapter {
                     tokenIn == token0,
                     int(amount),
                     tokenIn == token0 ? UniswapV3MathLib.MIN_SQRT_RATIO : UniswapV3MathLib.MAX_SQRT_RATIO,
-                    abi.encode(SwapCallbackData(tokenIn, amount))
+                    abi.encode(SwapCallbackData({tokenIn: tokenIn, amount: amount}))
                 );
 
             uint priceAfter = getPrice(pool, tokenIn, tokenOut, amount);

src/adapters/KyberAdapter.sol

@@ -84,7 +84,7 @@ contract KyberAdapter is Controllable, ICAmmAdapter {
                     int(amount),
                     tokenIn == token0,
                     tokenIn == token0 ? UniswapV3MathLib.MIN_SQRT_RATIO : UniswapV3MathLib.MAX_SQRT_RATIO,
-                    abi.encode(SwapCallbackData(tokenIn, amount))
+                    abi.encode(SwapCallbackData({tokenIn: tokenIn, amount: amount}))
                 );
 
             uint priceAfter = getPrice(pool, tokenIn, tokenOut, amount);

src/adapters/PendleAdapter.sol

@@ -113,7 +113,8 @@ contract PendleAdapter is Controllable, IAmmAdapter {
         // asset to PT
         if ((tokenIn == tokens[3] && tokenOut == tokens[1]) || (tokenIn == tokens[4] && tokenOut == tokens[1])) {
             // DefaultApprox means no off-chain preparation is involved, more gas consuming (~ 180k gas)
-            ApproxParams memory defaultApprox = ApproxParams(0, type(uint).max, 0, 256, 1e14);
+            ApproxParams memory defaultApprox =
+                ApproxParams({guessMin: 0, guessMax: type(uint).max, guessOffchain: 0, maxIteration: 256, eps: 1e14});
             TokenInput memory input = TokenInput({
                 tokenIn: tokenIn,
                 netTokenIn: amount,

src/adapters/UniswapV3Adapter.sol

@@ -89,7 +89,7 @@ contract UniswapV3Adapter is Controllable, ICAmmAdapter {
                     tokenIn == token0,
                     int(amount),
                     tokenIn == token0 ? UniswapV3MathLib.MIN_SQRT_RATIO : UniswapV3MathLib.MAX_SQRT_RATIO,
-                    abi.encode(SwapCallbackData(tokenIn, amount))
+                    abi.encode(SwapCallbackData({tokenIn: tokenIn, amount: amount}))
                 );
 
             uint priceAfter = getPrice(pool, tokenIn, tokenOut, amount);

src/adapters/libs/balancerv3/ReClammMath.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.24;
 
 import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
+//import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 //import {Rounding} from "../../../integrations/balancerv3/VaultTypes.sol";
 

src/core/Factory.sol

@@ -25,12 +25,8 @@ import {IStrategyLogic} from "../interfaces/IStrategyLogic.sol";
 ///         Provides the opportunity to upgrade vaults and strategies.
 /// Changelog:
 ///   2.0.0: BREAKING CHANGES
-///          * Removed `setVaultConfig` from IFactory
-///          * Removed `setStrategyLogicConfig` from IFactory
-///          - These functions are no longer available in the ABI
-///          - Governance/Operator config is now managed via `setVaultImplementation`
-///            and `setStrategyImplementation`
-///          * Integrations and deployment scripts must be updated accordingly
+///          * Removed `setVaultConfig` from IFactory; added `setVaultImplementation`
+///          * Removed `setStrategyLogicConfig` from IFactory; added `setStrategyImplementation`
 ///   1.3.1: setStrategyImplementation added to interface
 ///   1.3.0: vault can be built only by admin; setVaultImplementation, setStrategyImplementation;
 ///          remove setAliasName, getAliasName, whatToBuild; remove RVault and RMVault support
@@ -95,6 +91,7 @@ contract Factory is Controllable, ReentrancyGuardUpgradeable, IFactory {
         }
     }
 
+    /// @inheritdoc IFactory
     function setStrategyImplementation(string memory strategyId, address implementation) external onlyOperator {
         FactoryStorage storage $ = _getStorage();
         if (FactoryLib.setStrategyImplementation($, platform(), strategyId, implementation)) {

src/core/VaultPriceOracle.sol

@@ -66,7 +66,7 @@ contract VaultPriceOracle is Controllable, IVaultPriceOracle {
         uint currentRoundId = $.vaultPrices[vault_].roundId == 0 ? 1 : $.vaultPrices[vault_].roundId;
         require(roundId_ == currentRoundId, IVaultPriceOracle.InvalidRoundId());
 
-        $.observations[vault_][currentRoundId][msg.sender] = Observation(price_, block.timestamp);
+        $.observations[vault_][currentRoundId][msg.sender] = Observation({price: price_, timestamp: block.timestamp});
         emit PriceSubmitted(vault_, msg.sender, price_, currentRoundId);
 
         if (_countSubmissions(vault_, currentRoundId) >= $.minQuorum) {
@@ -288,7 +288,7 @@ contract VaultPriceOracle is Controllable, IVaultPriceOracle {
         uint medianPrice = _getMedian(prices);
 
         uint newRoundId = roundId_ + 1;
-        $.vaultPrices[vault_] = AggregatedData(medianPrice, block.timestamp, newRoundId);
+        $.vaultPrices[vault_] = AggregatedData({price: medianPrice, timestamp: block.timestamp, roundId: newRoundId});
         emit PriceUpdated(vault_, medianPrice, roundId_, block.timestamp);
     }
 

src/interfaces/IRevenueRouter.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 
-import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {EnumerableMap, EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 
 interface IRevenueRouter {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
@@ -19,6 +19,8 @@ interface IRevenueRouter {
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     error WaitForNewPeriod();
+    error IncorrectSetup();
+    error CantProcessAction();
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                         DATA TYPES                         */
@@ -36,6 +38,9 @@ interface IRevenueRouter {
         Unit[] units;
         address[] aavePools;
         EnumerableSet.AddressSet vaultsAccumulated;
+        EnumerableSet.AddressSet assetsAccumulated;
+        EnumerableMap.AddressToUintMap minSwapAmount;
+        EnumerableMap.AddressToUintMap maxSwapAmount;
     }
 
     enum UnitType {
@@ -64,6 +69,15 @@ interface IRevenueRouter {
     /// @notice Setup Aave pool list
     function setAavePools(address[] calldata pools) external;
 
+    /// @notice Set min swap amounts for assets
+    function setMinSwapAmounts(address[] calldata assets, uint[] calldata minAmounts) external;
+
+    /// @notice Set max swap amounts for assets
+    function setMaxSwapAmounts(address[] calldata assets, uint[] calldata maxAmounts) external;
+
+    /// @notice Change revenue share for Vaults Unit
+    function setXShare(uint newShare) external;
+
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                       USER ACTIONS                         */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -84,9 +98,15 @@ interface IRevenueRouter {
     /// @notice Claim units fees and swap to STBL
     function processUnitsRevenue() external;
 
-    /// @notice Withdraw assets from accumulated vaults and swap to STBL
+    /// @notice Withdraw assets from accumulated vaults
     function processAccumulatedVaults(uint maxVaultsForWithdraw) external;
 
+    /// @notice Withdraw assets from accumulated vaults
+    function processAccumulatedVaults(uint maxVaultsForWithdraw, uint maxWithdrawAmount) external;
+
+    /// @notice Distribute extracted accumulated assets amounts
+    function processAccumulatedAssets(uint maxAssetsForProcess) external;
+
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      VIEW FUNCTIONS                        */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -112,4 +132,7 @@ interface IRevenueRouter {
 
     /// @notice Get vault addresses that contract hold on balance, but not withdrew yet
     function vaultsAccumulated() external view returns (address[] memory);
+
+    /// @notice Get assets that contract hold on balance
+    function assetsAccumulated() external view returns (address[] memory);
 }