From 28c090c45331f34624f71da91161021055d86f48 Mon Sep 17 00:00:00 2001 From: Van0k Date: Wed, 3 Apr 2024 12:03:33 +0400 Subject: [PATCH] fix: update test configs --- contracts/test/config/DAI_Mainnet_config.sol | 10 ++- contracts/test/config/GHO_Mainnet_config.sol | 12 ++-- contracts/test/config/USDC_Mainnet_config.sol | 66 +++++++++---------- contracts/test/config/USDT_Mainnet_config.sol | 10 +-- contracts/test/config/WBTC_Mainnet_config.sol | 20 +++--- .../test/config/WETH_Arbitrum_config.sol | 2 +- contracts/test/config/WETH_Mainnet_config.sol | 64 +++++++----------- package.json | 2 +- yarn.lock | 8 +-- 9 files changed, 88 insertions(+), 106 deletions(-) diff --git a/contracts/test/config/DAI_Mainnet_config.sol b/contracts/test/config/DAI_Mainnet_config.sol index 52999d57..6fdf8ce8 100644 --- a/contracts/test/config/DAI_Mainnet_config.sol +++ b/contracts/test/config/DAI_Mainnet_config.sol @@ -51,17 +51,15 @@ contract CONFIG_MAINNET_DAI_V3 is IPoolV3DeployConfig { constructor() { _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 5, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 30_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 30_00})); + _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 50_00})); _quotaLimits.push( PoolQuotaLimit({token: Tokens.sDAI, quotaIncreaseFee: 0, limit: 30_000_000_000_000_000_000_000_000}) ); _quotaLimits.push( - PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000_000_000_000_000}) + PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 5_000_000_000_000_000_000_000_000}) ); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 0})); { /// CREDIT_MANAGER_0 diff --git a/contracts/test/config/GHO_Mainnet_config.sol b/contracts/test/config/GHO_Mainnet_config.sol index 39a8b24d..191e28ab 100644 --- a/contracts/test/config/GHO_Mainnet_config.sol +++ b/contracts/test/config/GHO_Mainnet_config.sol @@ -50,11 +50,15 @@ contract CONFIG_MAINNET_GHO_V3 is IPoolV3DeployConfig { CreditManagerV3DeployParams[] _creditManagers; constructor() { + _gaugeRates.push(GaugeRate({token: Tokens.USDC, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.DAI, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.USDT, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 5, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 30_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 30_00})); + _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 50_00})); + _quotaLimits.push( + PoolQuotaLimit({token: Tokens.USDC, quotaIncreaseFee: 1, limit: 30_000_000_000_000_000_000_000_000}) + ); _quotaLimits.push( PoolQuotaLimit({token: Tokens.DAI, quotaIncreaseFee: 1, limit: 30_000_000_000_000_000_000_000_000}) ); @@ -67,9 +71,7 @@ contract CONFIG_MAINNET_GHO_V3 is IPoolV3DeployConfig { _quotaLimits.push( PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000_000_000_000_000}) ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000_000_000_000_000}) - ); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 0})); { /// CREDIT_MANAGER_0 diff --git a/contracts/test/config/USDC_Mainnet_config.sol b/contracts/test/config/USDC_Mainnet_config.sol index 590555be..0d10458d 100644 --- a/contracts/test/config/USDC_Mainnet_config.sol +++ b/contracts/test/config/USDC_Mainnet_config.sol @@ -49,50 +49,50 @@ contract CONFIG_MAINNET_USDC_V3 is IPoolV3DeployConfig { CreditManagerV3DeployParams[] _creditManagers; constructor() { - _gaugeRates.push(GaugeRate({token: Tokens.WBTC, minRate: 4, maxRate: 12_00})); - _gaugeRates.push(GaugeRate({token: Tokens.WETH, minRate: 4, maxRate: 12_00})); + _gaugeRates.push(GaugeRate({token: Tokens.WBTC, minRate: 4, maxRate: 40_00})); + _gaugeRates.push(GaugeRate({token: Tokens.WETH, minRate: 4, maxRate: 40_00})); _gaugeRates.push(GaugeRate({token: Tokens.DAI, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.FRAX, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.crvUSD, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.USDT, minRate: 4, maxRate: 12_00})); - _gaugeRates.push(GaugeRate({token: Tokens.MKR, minRate: 80, maxRate: 24_00})); - _gaugeRates.push(GaugeRate({token: Tokens.UNI, minRate: 80, maxRate: 24_00})); - _gaugeRates.push(GaugeRate({token: Tokens.LINK, minRate: 80, maxRate: 24_00})); - _gaugeRates.push(GaugeRate({token: Tokens.LDO, minRate: 80, maxRate: 24_00})); - _gaugeRates.push(GaugeRate({token: Tokens.CRV, minRate: 2_40, maxRate: 40_00})); - _gaugeRates.push(GaugeRate({token: Tokens.CVX, minRate: 2_40, maxRate: 40_00})); + _gaugeRates.push(GaugeRate({token: Tokens.MKR, minRate: 80, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.UNI, minRate: 80, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.LINK, minRate: 80, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.LDO, minRate: 80, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.CRV, minRate: 2_40, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.CVX, minRate: 2_40, maxRate: 50_00})); _gaugeRates.push(GaugeRate({token: Tokens.FXS, minRate: 2_40, maxRate: 40_00})); _gaugeRates.push(GaugeRate({token: Tokens.APE, minRate: 2_40, maxRate: 40_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 5, maxRate: 5_00})); - _gaugeRates.push(GaugeRate({token: Tokens.yvUSDC, minRate: 50, maxRate: 5_00})); - _gaugeRates.push(GaugeRate({token: Tokens.yvDAI, minRate: 50, maxRate: 5_00})); - _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvUSDUSDC, minRate: 1_00, maxRate: 5_20})); - _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvUSDUSDT, minRate: 1_00, maxRate: 7_00})); - _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvUSDFRAX, minRate: 1_00, maxRate: 7_50})); + _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 5, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.yvUSDC, minRate: 50, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.yvDAI, minRate: 50, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvUSDUSDC, minRate: 1_00, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvUSDUSDT, minRate: 1_00, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvUSDFRAX, minRate: 1_00, maxRate: 15_00})); _gaugeRates.push(GaugeRate({token: Tokens.stkcvxcrvFRAX, minRate: 1_00, maxRate: 3_50})); - _gaugeRates.push(GaugeRate({token: Tokens.yvWETH, minRate: 1, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.yvWBTC, minRate: 1, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.STETH, minRate: 4, maxRate: 12_00})); - _gaugeRates.push(GaugeRate({token: Tokens.ezETH, minRate: 5, maxRate: 30_00})); - _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 30_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 30_00})); + _gaugeRates.push(GaugeRate({token: Tokens.yvWETH, minRate: 1, maxRate: 40_00})); + _gaugeRates.push(GaugeRate({token: Tokens.yvWBTC, minRate: 1, maxRate: 40_00})); + _gaugeRates.push(GaugeRate({token: Tokens.STETH, minRate: 4, maxRate: 40_00})); + _gaugeRates.push(GaugeRate({token: Tokens.ezETH, minRate: 5, maxRate: 40_00})); + _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 50_00})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.WBTC, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.WETH, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.DAI, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.FRAX, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.crvUSD, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDT, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.MKR, quotaIncreaseFee: 1, limit: 3_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.UNI, quotaIncreaseFee: 1, limit: 5_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.LINK, quotaIncreaseFee: 1, limit: 5_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.LDO, quotaIncreaseFee: 1, limit: 2_500_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.CRV, quotaIncreaseFee: 1, limit: 2_500_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.CVX, quotaIncreaseFee: 1, limit: 2_500_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.FXS, quotaIncreaseFee: 1, limit: 2_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.APE, quotaIncreaseFee: 1, limit: 500_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.MKR, quotaIncreaseFee: 1, limit: 500_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.UNI, quotaIncreaseFee: 1, limit: 500_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.LINK, quotaIncreaseFee: 1, limit: 500_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.LDO, quotaIncreaseFee: 1, limit: 500_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.CRV, quotaIncreaseFee: 1, limit: 200_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.CVX, quotaIncreaseFee: 1, limit: 200_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.FXS, quotaIncreaseFee: 1, limit: 0})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.APE, quotaIncreaseFee: 1, limit: 0})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.sDAI, quotaIncreaseFee: 0, limit: 30_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvUSDC, quotaIncreaseFee: 0, limit: 4_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvDAI, quotaIncreaseFee: 0, limit: 7_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvUSDC, quotaIncreaseFee: 0, limit: 0})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvDAI, quotaIncreaseFee: 0, limit: 0})); _quotaLimits.push( PoolQuotaLimit({token: Tokens.stkcvxcrvUSDUSDC, quotaIncreaseFee: 0, limit: 9_600_000_000_000}) ); @@ -102,13 +102,13 @@ contract CONFIG_MAINNET_USDC_V3 is IPoolV3DeployConfig { _quotaLimits.push( PoolQuotaLimit({token: Tokens.stkcvxcrvUSDFRAX, quotaIncreaseFee: 0, limit: 4_500_000_000_000}) ); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.stkcvxcrvFRAX, quotaIncreaseFee: 0, limit: 20_400_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.stkcvxcrvFRAX, quotaIncreaseFee: 0, limit: 0})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvWETH, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvWBTC, quotaIncreaseFee: 1, limit: 1_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.STETH, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.ezETH, quotaIncreaseFee: 0, limit: 3_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 40_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 10_000_000_000_000})); { /// CREDIT_MANAGER_0 diff --git a/contracts/test/config/USDT_Mainnet_config.sol b/contracts/test/config/USDT_Mainnet_config.sol index f6806fc4..05ed8288 100644 --- a/contracts/test/config/USDT_Mainnet_config.sol +++ b/contracts/test/config/USDT_Mainnet_config.sol @@ -29,7 +29,7 @@ contract CONFIG_MAINNET_USDT_V3 is IPoolV3DeployConfig { // POOL string public constant symbol = "dUSDTV3"; - string public constant name = "USDT v3"; + string public constant name = "Universal USDT v3"; PoolV3DeployParams _poolParams = PoolV3DeployParams({withdrawalFee: 0, totalDebtLimit: 100_000_000_000_000}); @@ -52,13 +52,13 @@ contract CONFIG_MAINNET_USDT_V3 is IPoolV3DeployConfig { _gaugeRates.push(GaugeRate({token: Tokens.DAI, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.USDC, minRate: 4, maxRate: 12_00})); _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 5, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 30_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 30_00})); + _gaugeRates.push(GaugeRate({token: Tokens.USDe, minRate: 5, maxRate: 50_00})); + _gaugeRates.push(GaugeRate({token: Tokens.sUSDe, minRate: 5, maxRate: 50_00})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.DAI, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDC, quotaIncreaseFee: 1, limit: 30_000_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.sDAI, quotaIncreaseFee: 0, limit: 30_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 3_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDe, quotaIncreaseFee: 0, limit: 5_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.sUSDe, quotaIncreaseFee: 0, limit: 0})); { /// CREDIT_MANAGER_0 diff --git a/contracts/test/config/WBTC_Mainnet_config.sol b/contracts/test/config/WBTC_Mainnet_config.sol index b3772872..9938a8db 100644 --- a/contracts/test/config/WBTC_Mainnet_config.sol +++ b/contracts/test/config/WBTC_Mainnet_config.sol @@ -64,8 +64,8 @@ contract CONFIG_MAINNET_WBTC_V3 is IPoolV3DeployConfig { _gaugeRates.push(GaugeRate({token: Tokens.FXS, minRate: 2_40, maxRate: 40_00})); _gaugeRates.push(GaugeRate({token: Tokens.APE, minRate: 2_40, maxRate: 40_00})); _gaugeRates.push(GaugeRate({token: Tokens.yvWETH, minRate: 1, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.yvUSDC, minRate: 1, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 1, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.yvUSDC, minRate: 1, maxRate: 27_00})); + _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 1, maxRate: 27_00})); _gaugeRates.push(GaugeRate({token: Tokens.yvWBTC, minRate: 1, maxRate: 15_00})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDC, quotaIncreaseFee: 1, limit: 75_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.WETH, quotaIncreaseFee: 1, limit: 75_000_000_000})); @@ -73,14 +73,14 @@ contract CONFIG_MAINNET_WBTC_V3 is IPoolV3DeployConfig { _quotaLimits.push(PoolQuotaLimit({token: Tokens.DAI, quotaIncreaseFee: 1, limit: 75_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.FRAX, quotaIncreaseFee: 1, limit: 75_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.USDT, quotaIncreaseFee: 1, limit: 75_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.MKR, quotaIncreaseFee: 1, limit: 7_500_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.UNI, quotaIncreaseFee: 1, limit: 12_500_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.LINK, quotaIncreaseFee: 1, limit: 12_500_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.LDO, quotaIncreaseFee: 1, limit: 6_250_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.CRV, quotaIncreaseFee: 1, limit: 6_250_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.CVX, quotaIncreaseFee: 1, limit: 6_250_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.FXS, quotaIncreaseFee: 1, limit: 5_000_000_000})); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.APE, quotaIncreaseFee: 1, limit: 1_250_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.MKR, quotaIncreaseFee: 1, limit: 750_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.UNI, quotaIncreaseFee: 1, limit: 750_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.LINK, quotaIncreaseFee: 1, limit: 750_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.LDO, quotaIncreaseFee: 1, limit: 750_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.CRV, quotaIncreaseFee: 1, limit: 300_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.CVX, quotaIncreaseFee: 1, limit: 300_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.FXS, quotaIncreaseFee: 1, limit: 0})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.APE, quotaIncreaseFee: 1, limit: 0})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvWETH, quotaIncreaseFee: 1, limit: 75_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.yvUSDC, quotaIncreaseFee: 1, limit: 10_000_000_000})); _quotaLimits.push(PoolQuotaLimit({token: Tokens.sDAI, quotaIncreaseFee: 1, limit: 75_000_000_000})); diff --git a/contracts/test/config/WETH_Arbitrum_config.sol b/contracts/test/config/WETH_Arbitrum_config.sol index 9e237bca..aa8c7b56 100644 --- a/contracts/test/config/WETH_Arbitrum_config.sol +++ b/contracts/test/config/WETH_Arbitrum_config.sol @@ -124,7 +124,7 @@ contract CONFIG_ARBITRUM_WETH_V3 is IPoolV3DeployConfig { cts.push(CollateralTokenHuman({token: Tokens.cbETH, lt: 96_00})); - cts.push(CollateralTokenHuman({token: Tokens.ezETH, lt: 96_00})); + cts.push(CollateralTokenHuman({token: Tokens.ezETH, lt: 90_00})); Contracts[] storage cs = cp.contracts; cs.push(Contracts.UNISWAP_V3_ROUTER); UniswapV3Pair[] storage uv3p = cp.uniswapV3Pairs; diff --git a/contracts/test/config/WETH_Mainnet_config.sol b/contracts/test/config/WETH_Mainnet_config.sol index 88c7e8c4..7cc8e3b6 100644 --- a/contracts/test/config/WETH_Mainnet_config.sol +++ b/contracts/test/config/WETH_Mainnet_config.sol @@ -63,9 +63,9 @@ contract CONFIG_MAINNET_WETH_V3 is IPoolV3DeployConfig { _gaugeRates.push(GaugeRate({token: Tokens.CVX, minRate: 2_40, maxRate: 40_00})); _gaugeRates.push(GaugeRate({token: Tokens.FXS, minRate: 2_40, maxRate: 40_00})); _gaugeRates.push(GaugeRate({token: Tokens.APE, minRate: 2_40, maxRate: 40_00})); - _gaugeRates.push(GaugeRate({token: Tokens.yvUSDC, minRate: 1, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.yvUSDC, minRate: 1, maxRate: 27_00})); _gaugeRates.push(GaugeRate({token: Tokens.yvWBTC, minRate: 1, maxRate: 15_00})); - _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 1, maxRate: 15_00})); + _gaugeRates.push(GaugeRate({token: Tokens.sDAI, minRate: 1, maxRate: 27_00})); _gaugeRates.push(GaugeRate({token: Tokens.STETH, minRate: 5, maxRate: 3_50})); _gaugeRates.push(GaugeRate({token: Tokens.rETH, minRate: 5, maxRate: 3_16})); _gaugeRates.push(GaugeRate({token: Tokens.osETH, minRate: 5, maxRate: 3_16})); @@ -75,6 +75,7 @@ contract CONFIG_MAINNET_WETH_V3 is IPoolV3DeployConfig { _gaugeRates.push(GaugeRate({token: Tokens.auraB_rETH_STABLE_vault, minRate: 1_00, maxRate: 5_50})); _gaugeRates.push(GaugeRate({token: Tokens.weETH, minRate: 5, maxRate: 30_00})); _gaugeRates.push(GaugeRate({token: Tokens.ezETH, minRate: 5, maxRate: 30_00})); + _gaugeRates.push(GaugeRate({token: Tokens.rsETH, minRate: 5, maxRate: 30_00})); _quotaLimits.push( PoolQuotaLimit({token: Tokens.WBTC, quotaIncreaseFee: 1, limit: 15_000_000_000_000_000_000_000}) ); @@ -90,28 +91,14 @@ contract CONFIG_MAINNET_WETH_V3 is IPoolV3DeployConfig { _quotaLimits.push( PoolQuotaLimit({token: Tokens.USDT, quotaIncreaseFee: 1, limit: 15_000_000_000_000_000_000_000}) ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.MKR, quotaIncreaseFee: 1, limit: 1_500_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.UNI, quotaIncreaseFee: 1, limit: 2_500_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.LINK, quotaIncreaseFee: 1, limit: 2_500_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.LDO, quotaIncreaseFee: 1, limit: 1_250_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.CRV, quotaIncreaseFee: 1, limit: 1_250_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.CVX, quotaIncreaseFee: 1, limit: 1_250_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.FXS, quotaIncreaseFee: 1, limit: 1_000_000_000_000_000_000_000}) - ); - _quotaLimits.push(PoolQuotaLimit({token: Tokens.APE, quotaIncreaseFee: 1, limit: 250_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.MKR, quotaIncreaseFee: 1, limit: 135_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.UNI, quotaIncreaseFee: 1, limit: 135_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.LINK, quotaIncreaseFee: 1, limit: 135_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.LDO, quotaIncreaseFee: 1, limit: 135_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.CRV, quotaIncreaseFee: 1, limit: 55_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.CVX, quotaIncreaseFee: 1, limit: 55_000_000_000_000_000_000})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.FXS, quotaIncreaseFee: 1, limit: 0})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.APE, quotaIncreaseFee: 1, limit: 0})); _quotaLimits.push( PoolQuotaLimit({token: Tokens.yvUSDC, quotaIncreaseFee: 1, limit: 15_000_000_000_000_000_000_000}) ); @@ -133,28 +120,17 @@ contract CONFIG_MAINNET_WETH_V3 is IPoolV3DeployConfig { _quotaLimits.push( PoolQuotaLimit({token: Tokens.yvWETH, quotaIncreaseFee: 0, limit: 15_000_000_000_000_000_000_000}) ); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.stkcvxcrvUSDTWBTCWETH, quotaIncreaseFee: 0, limit: 0})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.stkcvxcrvUSDETHCRV, quotaIncreaseFee: 0, limit: 0})); + _quotaLimits.push(PoolQuotaLimit({token: Tokens.auraB_rETH_STABLE_vault, quotaIncreaseFee: 0, limit: 0})); _quotaLimits.push( - PoolQuotaLimit({ - token: Tokens.stkcvxcrvUSDTWBTCWETH, - quotaIncreaseFee: 0, - limit: 7_750_000_000_000_000_000_000 - }) + PoolQuotaLimit({token: Tokens.weETH, quotaIncreaseFee: 0, limit: 20_000_000_000_000_000_000_000}) ); _quotaLimits.push( - PoolQuotaLimit({token: Tokens.stkcvxcrvUSDETHCRV, quotaIncreaseFee: 0, limit: 2_700_000_000_000_000_000_000}) + PoolQuotaLimit({token: Tokens.ezETH, quotaIncreaseFee: 0, limit: 30_000_000_000_000_000_000_000}) ); _quotaLimits.push( - PoolQuotaLimit({ - token: Tokens.auraB_rETH_STABLE_vault, - quotaIncreaseFee: 0, - limit: 10_000_000_000_000_000_000_000 - }) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.weETH, quotaIncreaseFee: 0, limit: 15_000_000_000_000_000_000_000}) - ); - _quotaLimits.push( - PoolQuotaLimit({token: Tokens.ezETH, quotaIncreaseFee: 0, limit: 15_000_000_000_000_000_000_000}) + PoolQuotaLimit({token: Tokens.rsETH, quotaIncreaseFee: 0, limit: 2_000_000_000_000_000_000_000}) ); { @@ -588,6 +564,8 @@ contract CONFIG_MAINNET_WETH_V3 is IPoolV3DeployConfig { cts.push(CollateralTokenHuman({token: Tokens.ezETH, lt: 91_50})); + cts.push(CollateralTokenHuman({token: Tokens.rsETH, lt: 91_50})); + cts.push(CollateralTokenHuman({token: Tokens.rETH, lt: 0})); cts.push(CollateralTokenHuman({token: Tokens.rETH_f, lt: 0})); @@ -614,6 +592,10 @@ contract CONFIG_MAINNET_WETH_V3 is IPoolV3DeployConfig { bp.push( BalancerPool({poolId: 0x848a5564158d84b8a8fb68ab5d004fae11619a5400000000000000000000066a, status: 2}) ); + + bp.push( + BalancerPool({poolId: 0x58aadfb1afac0ad7fca1148f3cde6aedf5236b6d00000000000000000000067f, status: 2}) + ); cs.push(Contracts.CURVE_RETH_ETH_POOL); } } diff --git a/package.json b/package.json index d7d18a66..b7834dd4 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@gearbox-protocol/eslint-config": "^1.6.1", "@gearbox-protocol/oracles-v3": "^1.10.3", "@gearbox-protocol/prettier-config": "^1.5.0", - "@gearbox-protocol/sdk-gov": "^1.53.0", + "@gearbox-protocol/sdk-gov": "^1.57.0", "@openzeppelin/contracts": "4.9.3", "@redstone-finance/evm-connector": "0.2.5", "@typechain/ethers-v5": "^10.1.0", diff --git a/yarn.lock b/yarn.lock index 4e14bb33..345c971d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1399,10 +1399,10 @@ resolved "https://registry.yarnpkg.com/@gearbox-protocol/prettier-config/-/prettier-config-1.5.0.tgz#4df8e9fd2305fee6ab8c1417a02e31343836932a" integrity sha512-FUoprSsBdZyBjgxXCKL6mTkbeUJytaLzPJqIOoQpDmBRTX0seCc2o5I9PI9tySoRIlNnd/XXnKCXq1xHDEGbxw== -"@gearbox-protocol/sdk-gov@^1.53.0": - version "1.53.0" - resolved "https://registry.yarnpkg.com/@gearbox-protocol/sdk-gov/-/sdk-gov-1.53.0.tgz#4910564ba2d2c85a22b308ae816e44f87d6683ee" - integrity sha512-EIyPiJ4/0HICR08ATEy1LswqidNfKYeeKqYAbz5XjPJ0eGqUFvOwOaehsyfTr1bmOTd4VeKJrwsoFvo4gBRGOw== +"@gearbox-protocol/sdk-gov@^1.57.0": + version "1.57.0" + resolved "https://registry.yarnpkg.com/@gearbox-protocol/sdk-gov/-/sdk-gov-1.57.0.tgz#024611df70f2be62abe01b86407992daf1c7e7d8" + integrity sha512-srvjr0Njjo+e86i+ltpzR4HM1oL2gOdZRpHHyKF5jtiT8ZN4KxImBSUXJY34WRj1VndueIWD6oivphp4R/924Q== dependencies: "@types/yaml" "^1.9.7" add "^2.0.6"