3.0.0 rc3

.github/workflows/tests.yml

@@ -133,6 +133,7 @@ jobs:
             hardhat-network-fork-
       - run: yarn test:extreme:integration
         env:
+          NODE_OPTIONS: '--max-old-space-size=4096'
           TS_NODE_SKIP_IGNORE: true
           MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }}
 

.solhintignore

@@ -18,4 +18,5 @@ contracts/libraries/Fixed.sol
 
 contracts/vendor
 contracts/plugins/assets/compound/vendor
-contracts/plugins/assets/convex/vendor
+contracts/plugins/assets/curve/crv
+contracts/plugins/assets/curve/cvx

CHANGELOG.md

@@ -13,6 +13,8 @@ Collateral / Asset plugins from 2.1.0 do not need to be upgraded
 
 #### Core Protocol Contracts
 
+Bump solidity version to 0.8.19
+
 - `AssetRegistry` [+1 slot]
   Summary: Other component contracts need to know when refresh() was last called
   - Add last refresh timestamp tracking and expose via `lastRefresh()` getter

common/configuration.ts

@@ -48,18 +48,23 @@ export interface ITokens {
   wstETH?: string
   rETH?: string
   cUSDCv3?: string
+  sDAI?: string
 }
 
 export interface IFeeds {
   stETHETH?: string
   stETHUSD?: string
 }
 
-export interface IPlugins {
+export interface IPools {
   cvx3Pool?: string
   cvxeUSDFRAXBP?: string
   cvxTriCrypto?: string
   cvxMIM3Pool?: string
+  crv3Pool?: string
+  crveUSDFRAXBP?: string
+  crvTriCrypto?: string
+  crvMIM3Pool?: string
 }
 
 interface INetworkConfig {
@@ -69,6 +74,7 @@ interface INetworkConfig {
   AAVE_LENDING_POOL?: string
   AAVE_INCENTIVES?: string
   AAVE_EMISSIONS_MGR?: string
+  AAVE_RESERVE_TREASURY?: string
   COMPTROLLER?: string
   FLUX_FINANCE_COMPTROLLER?: string
   GNOSIS_EASY_AUCTION?: string
@@ -126,6 +132,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = {
       wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
       rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
       cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3',
+      sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea',
     },
     chainlinkFeeds: {
       RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02',
@@ -153,6 +160,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = {
     AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9',
     AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5',
     AAVE_EMISSIONS_MGR: '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5',
+    AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c',
     FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51',
     COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B',
     GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101',
@@ -211,6 +219,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = {
       wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
       rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
       cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3',
+      sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea',
     },
     chainlinkFeeds: {
       RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02',
@@ -236,6 +245,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = {
       rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH
     },
     AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9',
+    AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c',
     FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51',
     COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B',
     GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101',
@@ -422,6 +432,7 @@ export const MAX_MIN_TRADE_VOLUME = BigNumber.from(10).pow(29)
 export const MIN_THROTTLE_AMT_RATE = BigNumber.from(10).pow(18)
 export const MAX_THROTTLE_AMT_RATE = BigNumber.from(10).pow(48)
 export const MAX_THROTTLE_PCT_RATE = BigNumber.from(10).pow(18)
+export const GNOSIS_MAX_TOKENS = BigNumber.from(7).mul(BigNumber.from(10).pow(28))
 
 // Timestamps
 export const MAX_ORACLE_TIMEOUT = BigNumber.from(2).pow(48).sub(1)

contracts/facade/DeployerRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "../interfaces/IDeployerRegistry.sol";

contracts/facade/FacadeAct.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/Multicall.sol";
@@ -14,6 +14,7 @@ import "../interfaces/IFacadeRead.sol";
  *   For use with ^3.0.0 RTokens.
  */
 contract FacadeAct is IFacadeAct, Multicall {
+    using SafeERC20 for IERC20;
     using FixLib for uint192;
 
     function claimRewards(IRToken rToken) public {

contracts/facade/FacadeRead.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "../plugins/trading/DutchTrade.sol";

contracts/facade/FacadeTest.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "../interfaces/IAsset.sol";

contracts/facade/FacadeWrite.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "../interfaces/IFacadeWrite.sol";
 import "./lib/FacadeWriteLib.sol";

contracts/facade/lib/FacadeWriteLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "../../plugins/governance/Governance.sol";
 

contracts/interfaces/IAsset.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

contracts/interfaces/IAssetRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IAsset.sol";

contracts/interfaces/IBackingManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IBroker.sol";

contracts/interfaces/IBasketHandler.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "../libraries/Fixed.sol";

contracts/interfaces/IBroker.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./IAsset.sol";
 import "./IComponent.sol";

contracts/interfaces/IComponent.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./IMain.sol";
 import "./IVersioned.sol";

contracts/interfaces/IDeployer.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "../libraries/Throttle.sol";
@@ -30,7 +30,7 @@ struct DeploymentParams {
     uint48 longFreeze; // {s} how long each freeze extension lasts
     //
     // === Rewards (Furnace + StRSR) ===
-    uint192 rewardRatio; // the fraction of available revenues that are paid out each 12s period
+    uint192 rewardRatio; // the fraction of available revenues that are paid out each block period
     //
     // === StRSR ===
     uint48 unstakingDelay; // {s} the "thawing time" of staked RSR before withdrawal

contracts/interfaces/IDeployerRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./IDeployer.sol";
 

contracts/interfaces/IDistributor.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IComponent.sol";

contracts/interfaces/IFacadeAct.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "../interfaces/IBackingManager.sol";
+import "../interfaces/IStRSRVotes.sol";
 import "../interfaces/IRevenueTrader.sol";
 import "../interfaces/IRToken.sol";
 

contracts/interfaces/IFacadeRead.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "../p1/RToken.sol";
 import "./IRToken.sol";

contracts/interfaces/IFacadeTest.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./IRToken.sol";
 import "./IStRSR.sol";

contracts/interfaces/IFacadeWrite.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./IDeployer.sol";
 

contracts/interfaces/IFurnace.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "../libraries/Fixed.sol";
 import "./IComponent.sol";

contracts/interfaces/IGnosis.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

contracts/interfaces/IMain.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/access/IAccessControlUpgradeable.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -16,10 +16,6 @@ import "./IStRSR.sol";
 import "./ITrading.sol";
 import "./IVersioned.sol";
 
-// Warning, assumption: Chain should have blocktimes of 12s
-// See docs/system-design.md for discussion of handling longer or shorter times
-uint48 constant ONE_BLOCK = 12; //{s}
-
 // === Auth roles ===
 
 bytes32 constant OWNER = bytes32(bytes("OWNER"));

contracts/interfaces/IRToken.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
 // solhint-disable-next-line max-line-length

contracts/interfaces/IRevenueTrader.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./IBroker.sol";
 import "./IComponent.sol";

contracts/interfaces/IRewardable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IComponent.sol";

contracts/interfaces/IStRSR.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
 // solhint-disable-next-line max-line-length

contracts/interfaces/IStRSRVotes.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol";
 

contracts/interfaces/ITrade.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "./IBroker.sol";

contracts/interfaces/ITrading.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "../libraries/Fixed.sol";

contracts/interfaces/IVersioned.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 interface IVersioned {
     function version() external view returns (string memory);

contracts/libraries/Array.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

contracts/libraries/Fixed.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
 // solhint-disable func-name-mixedcase func-visibility
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.19;
 
 /// @title FixedPoint, a fixed-point arithmetic library defining the custom type uint192
 /// @author Matt Elder <[email protected]> and the Reserve Team <https://reserve.org>

contracts/libraries/Permit.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/cryptography/SignatureCheckerUpgradeable.sol";

contracts/libraries/String.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 // From https://gist.github.com/ottodevs/c43d0a8b4b891ac2da675f825b1d1dbf
 library StringLib {

contracts/libraries/Throttle.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity 0.8.17;
+pragma solidity 0.8.19;
 
 import "./Fixed.sol";
 

contracts/libraries/test/ArrayCallerMock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.19;
 
 import "../Array.sol";
 

contracts/libraries/test/FixedCallerMock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.19;
 
 import "../Fixed.sol";
 

contracts/libraries/test/StringCallerMock.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BlueOak-1.0.0
-pragma solidity ^0.8.17;
+pragma solidity ^0.8.19;
 
 import "../String.sol";